Merge branch 'main' of https://github.com/SFUnity/Mayhem-2024-Offseason

SFUnity · Sep 21, 2024 · fb22926 · fb22926
2 parents d653f20 + d658591
commit fb22926
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/frc/robot/subsystems/drive/Drive.java b/src/main/java/frc/robot/subsystems/drive/Drive.java
@@ -18,16 +18,16 @@ public void periodic() {
     // GeneralUtil.logSubsystem(this, "Shooter/Feeder");
   }
 
-  public void fullStop() {
+  private void fullStop() {
     io.stopDriveTrain();
   }
 
-  public void driveForwardFullSpeed() {
+  private void driveForwardFullSpeed() {
     io.arcadeDrive(1.0, 0);
   }
 
-  public void driveCustom(double speed, double zRotation) {
-    io.arcadeDrive(speed, zRotation);
+  private void arcadeDrive(double speed, double omegaRotation) {
+    io.arcadeDrive(speed, omegaRotation);
   }
 
   public Command joystickDrive(Supplier<Double> xInput, Supplier<Double> omegaRotationInput) {
@@ -39,7 +39,7 @@ public Command joystickDrive(Supplier<Double> xInput, Supplier<Double> omegaRota
           }
 
           double omegaRotation = omegaRotationInput.get();
-          driveCustom(xSpeed, omegaRotation);
+          arcadeDrive(xSpeed, omegaRotation);
         })
         .withName("joystick drive");
   }

diff --git a/src/main/java/frc/robot/subsystems/drive/DriveIOReal.java b/src/main/java/frc/robot/subsystems/drive/DriveIOReal.java
@@ -21,7 +21,7 @@ public void stopDriveTrain() {
     driveTrain.stopMotor();
   }
 
-  public void arcadeDrive(double xSpeed, double zRotation) {
-    driveTrain.arcadeDrive(xSpeed, zRotation);
+  public void arcadeDrive(double xSpeed, double omegaRotation) {
+    driveTrain.arcadeDrive(xSpeed, omegaRotation);
   }
 }