From a24b7ea0e7dce6bdda20e19e2c5d49cf74e2e388 Mon Sep 17 00:00:00 2001
From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com>
Date: Wed, 26 Feb 2025 17:14:17 -0700
Subject: [PATCH] fix faulty merge conflict managements

---
 src/main/java/frc4388/robot/RobotContainer.java      | 4 ++--
 src/main/java/frc4388/robot/subsystems/Elevator.java | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java
index 4ce4eb5..caec0f0 100644
--- a/src/main/java/frc4388/robot/RobotContainer.java
+++ b/src/main/java/frc4388/robot/RobotContainer.java
@@ -88,7 +88,7 @@ public class RobotContainer {
     // private final LED m_robotLED = new LED();
     public final Vision m_vision = new Vision(m_robotMap.leftCamera, m_robotMap.rightCamera);
     public final Lidar m_lidar = new Lidar();
-    public final Elevator m_robotElevator= new Elevator(m_robotMap.elevator, m_robotMap.endeffector, m_robotMap.basinLimitSwitch, m_robotMap.endeffectorLimitSwitch);
+    public final Elevator m_robotElevator = new Elevator(m_robotMap.elevator, m_robotMap.endeffector, m_robotMap.basinLimitSwitch, m_robotMap.endeffectorLimitSwitch);
     public final SwerveDrive m_robotSwerveDrive = new SwerveDrive(m_robotMap.swerveDrivetrain, m_vision);
     // public final SwerveDrive m_robotSwerveDrive = new SwerveDrive(m_robotMap.swerveDrivetrain);
 
@@ -494,7 +494,7 @@ public class RobotContainer {
         new JoystickButton(getButtonBox(), ButtonBox.White)
             .onTrue(new InstantCommand(() -> {
                 m_robotElevator.elevatorStop(); 
-                m_robotElevator.endefectorStop();
+                m_robotElevator.endeffectorStop();
                 m_robotSwerveDrive.endSlowPeriod();
             }, m_robotElevator));
 
diff --git a/src/main/java/frc4388/robot/subsystems/Elevator.java b/src/main/java/frc4388/robot/subsystems/Elevator.java
index f58dbee..99ce643 100644
--- a/src/main/java/frc4388/robot/subsystems/Elevator.java
+++ b/src/main/java/frc4388/robot/subsystems/Elevator.java
@@ -193,12 +193,11 @@ public class Elevator extends SubsystemBase {
   public boolean endeffectorAtReference() {
     // double elevatorRefrence = endefectorMotor.getClosedLoopReference().getValueAsDouble();
     double endeffectorPosition = endeffectorMotor.getPosition().getValueAsDouble();
-    double endefectorPosition = endefectorMotor.getPosition().getValueAsDouble();
-    double diffrence = endefectorRefrence - endefectorPosition;
+    double diffrence = endeffectorRefrence - endeffectorPosition;
 
     boolean headedUp = diffrence < 0;
-    boolean forwardLimit = endefectorMotor.getForwardLimit().asSupplier().get().value == 0;
-    boolean reverseLimit = endefectorMotor.getReverseLimit().asSupplier().get().value == 0;
+    boolean forwardLimit = endeffectorMotor.getForwardLimit().asSupplier().get().value == 0;
+    boolean reverseLimit = endeffectorMotor.getReverseLimit().asSupplier().get().value == 0;
 
     return (Math.abs(diffrence) <= 0.5 || (reverseLimit && headedUp) || (forwardLimit && !headedUp));
   }