renamed some variables

Team334 · Jan 21, 2025 · 378c0cf · 378c0cf
1 parent 2e88c10
commit 378c0cf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
@@ -90,7 +90,7 @@ public static class WristevatorConstants {
     public static final AngularVelocity maxWristSpeed = RadiansPerSecond.of(Math.PI);
     public static final LinearVelocity maxElevatorSpeed = MetersPerSecond.of(1);
 
-    public static final int elevatorSwitchPort = 0;
+    public static final int homeSwitch = 0;
 
     public static final int leftMotorId = 0;
     public static final int rightMotorId = 1;
@@ -103,7 +103,7 @@ public static class SerializerConstants {
   }
 
   public static class ManipulatorConstants {
-    public static final int manipulatorBeamPort = 3;
-    public static final int manipulatorSwitchPort = 4;
+    public static final int beamPort = 3;
+    public static final int switchPort = 4;
   }
 }
diff --git a/src/main/java/frc/robot/subsystems/Manipulator.java b/src/main/java/frc/robot/subsystems/Manipulator.java
@@ -14,10 +14,8 @@
 public class Manipulator extends AdvancedSubsystem {
   private final Consumer<Piece> _currentPieceSetter;
 
-  private final DigitalInput _manipulatorBeam =
-      new DigitalInput(ManipulatorConstants.manipulatorBeamPort);
-  private final DigitalInput _algaeSwitch =
-      new DigitalInput(ManipulatorConstants.manipulatorSwitchPort);
+  private final DigitalInput _beam = new DigitalInput(ManipulatorConstants.beamPort);
+  private final DigitalInput _limitSwitch = new DigitalInput(ManipulatorConstants.switchPort);
 
   private final Trigger _beamBroken = new Trigger(this::getBeam);
   private final Trigger _switchPressed = new Trigger(this::getSwitch);
@@ -67,13 +65,13 @@ public double getSpeed() {
 
   @Logged(name = "Manipulator Beam")
   public boolean getBeam() {
-    return !_manipulatorBeam.get();
+    return !_beam.get();
   }
 
   @Logged(name = "Manipulator Switch")
   public boolean getSwitch() {
     // TODO: might have two switches
-    return _algaeSwitch.get();
+    return _limitSwitch.get();
   }
 
   /** Set the speed of the manipulator feed motor in rad/s. */

diff --git a/src/main/java/frc/robot/subsystems/Wristevator.java b/src/main/java/frc/robot/subsystems/Wristevator.java
@@ -74,8 +74,7 @@ public Distance getHeight() {
   private final TalonFX _wristMotor =
       new TalonFX(WristevatorConstants.wristMotorId, Constants.canivore);
 
-  private final DigitalInput _homeSwitch =
-      new DigitalInput(WristevatorConstants.elevatorSwitchPort);
+  private final DigitalInput _homeSwitch = new DigitalInput(WristevatorConstants.homeSwitch);
 
   private final DIOSim _homeSwitchSim;