From fc1076c5e9dc66acc837eddb99bfffd7a393443c Mon Sep 17 00:00:00 2001
From: aarav18 <aaravshah18@gmail.com>
Date: Fri, 18 Mar 2022 14:15:55 -0600
Subject: [PATCH] merge

---
 .../java/frc4388/robot/RobotContainer.java    | 36 +------------------
 .../robot/subsystems/ClimberRewrite.java      |  6 ----
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java
index 5cb54c8..d94e2d8 100644
--- a/src/main/java/frc4388/robot/RobotContainer.java
+++ b/src/main/java/frc4388/robot/RobotContainer.java
@@ -112,14 +112,7 @@ public class RobotContainer {
 
   /* Subsystems */
   public final ClimberRewrite m_robotClimber = new ClimberRewrite(m_robotMap.shoulder, m_robotMap.elbow, m_robotMap.gyro, false);
-<<<<<<< Updated upstream
-  
-  private final Claws m_robotClaws = new Claws(m_robotMap.leftClaw, m_robotMap.rightClaw);
-
-  // Subsystems 
-=======
   public final Claws m_robotClaws = new Claws(m_robotMap.leftClaw, m_robotMap.rightClaw); 
->>>>>>> Stashed changes
   public final SwerveDrive m_robotSwerveDrive = new SwerveDrive(m_robotMap.leftFront, m_robotMap.leftBack, m_robotMap.rightFront, m_robotMap.rightBack, m_robotMap.gyro);
   public final Serializer m_robotSerializer = new Serializer(m_robotMap.serializerBelt, /*m_robotMap.serializerShooterBelt,*/ m_robotMap.serializerBeam);
   public final Intake m_robotIntake = new Intake(m_robotMap.intakeMotor);
@@ -203,7 +196,6 @@ public class RobotContainer {
     m_robotSerializer.setDefaultCommand(
       new RunCommand(() -> m_robotSerializer.setSerializer(getOperatorController().getLeftTriggerAxis() * 0.8),//m_robotSerializer.setSerializerStateWithBeam(), 
         m_robotSerializer).withName("Serializer setSerializerStateWithBeam defaultCommand"));
-<<<<<<< Updated upstream
         
     // Turret Manual
 
@@ -217,12 +209,6 @@ public class RobotContainer {
         .until(() -> this.currentMode.equals(CurrentMode.TURRET)));
           
         // EnableTurret()
-=======
-      // Turret Manual
-    // m_robotTurret.setDefaultCommand(
-    //     new RunCommand(() -> m_robotTurret.runTurretWithInput(getOperatorController().getLeftX()), 
-    //     m_robotTurret).withName("Turret runTurretWithInput defaultCommand"));
->>>>>>> Stashed changes
 
     // m_robotHood.setDefaultCommand(
     //    new RunCommand(() -> m_robotHood.runHood(getOperatorController().getRightY()), m_robotHood));
@@ -425,26 +411,7 @@ public class RobotContainer {
    * Finally, adds the existing path files to the auto chooser
    */
   private void autoInit() {
-<<<<<<< Updated upstream
-    // try {
-    //   WatchKey watchKey = PATHPLANNER_DIRECTORY.register(FileSystems.getDefault().newWatchService(),
-    //       StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_MODIFY,
-    //       StandardWatchEventKinds.ENTRY_DELETE);
-    //   // TODO: Store this and other commands as fields so they can be rescheduled.
-    //   new NotifierCommand(() -> updateAutoChooser(watchKey), 0.5) {
-    //     @Override
-    //     public boolean runsWhenDisabled() {
-    //       return true;
-    //     }
-    //   }.withName("Path Watcher").schedule();
-    // } catch (IOException exception) {
-    //   LOGGER.log(Level.SEVERE, "Exception with path file watcher.", exception);
-    // }
-    // Arrays.stream(PATHPLANNER_DIRECTORY.toFile().listFiles())
-    //     .filter(file -> file.getName().endsWith(".path")).sorted(Comparator.comparingLong(File::lastModified))
-    //     .forEachOrdered(file -> autoChooser.addOption(file.getName(), file));
-    // SmartDashboard.putData("Auto Chooser", autoChooser);
-=======
+
     try {
       WatchKey watchKey = PATHPLANNER_DIRECTORY.register(FileSystems.getDefault().newWatchService(),
           StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_MODIFY,
@@ -463,7 +430,6 @@ public class RobotContainer {
         .filter(file -> file.getName().endsWith(".path")).sorted(Comparator.comparingLong(File::lastModified))
         .forEachOrdered(file -> autoChooser.addOption(file.getName(), file));
     SmartDashboard.putData("Auto Chooser", autoChooser);
->>>>>>> Stashed changes
   }
 
   /**
diff --git a/src/main/java/frc4388/robot/subsystems/ClimberRewrite.java b/src/main/java/frc4388/robot/subsystems/ClimberRewrite.java
index a9d208a..83b6e2b 100644
--- a/src/main/java/frc4388/robot/subsystems/ClimberRewrite.java
+++ b/src/main/java/frc4388/robot/subsystems/ClimberRewrite.java
@@ -286,11 +286,6 @@ public class ClimberRewrite extends SubsystemBase {
     return getClimberPosition(jointAngles[0], jointAngles[1]);
   }
 
-<<<<<<< Updated upstream
-  public double getCurrent() {
-    return (this.m_elbow.getSupplyCurrent() + this.m_shoulder.getSupplyCurrent());
-  }
-=======
   public void setClimberSoftLimits(boolean set){
     m_elbow.configForwardSoftLimitEnable(set);
     m_shoulder.configForwardSoftLimitEnable(set);
@@ -305,5 +300,4 @@ public class ClimberRewrite extends SubsystemBase {
     return (m_shoulder.getSupplyCurrent() + m_elbow.getSupplyCurrent());
   }
 
->>>>>>> Stashed changes
 }