From f25b50a3931f03cf91287a4a9719adacec8ad4d7 Mon Sep 17 00:00:00 2001
From: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date: Thu, 29 Feb 2024 18:21:49 -0800
Subject: [PATCH] fix merge breaks

---
 src/main/java/frc/robot/RobotContainer.java        | 5 -----
 src/main/java/frc/robot/commands/AutoPosition.java | 9 ---------
 2 files changed, 14 deletions(-)

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 36a41b9..b650b27 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -6,10 +6,8 @@
 import frc.robot.Constants.SwerveModuleConstants;
 import frc.robot.Constants.ArmConstants;
 import frc.robot.commands.Autos;
-import frc.robot.commands.AimAtTag;
 import frc.robot.commands.ArmRotateTo;
 import frc.robot.commands.AutoPosition;
-import frc.robot.commands.ChassisRemoteControl;
 import frc.robot.commands.SetLightstripColor;
 import frc.robot.Constants.VisionConstants;
 import frc.robot.subsystems.LightStrip;
@@ -168,9 +166,6 @@ public void setUpDriveController() {
 
 			xbox.a().whileTrue(new AutoPosition(drivetrain, vision));
 		}
-
-			drivetrain.setDefaultCommand(new ChassisRemoteControl(drivetrain, inputs));
-		}
 	}
 
 	public void setUpOperatorController() {
diff --git a/src/main/java/frc/robot/commands/AutoPosition.java b/src/main/java/frc/robot/commands/AutoPosition.java
index 1194d5c..c541ab4 100644
--- a/src/main/java/frc/robot/commands/AutoPosition.java
+++ b/src/main/java/frc/robot/commands/AutoPosition.java
@@ -1,22 +1,13 @@
 package frc.robot.commands;
 
-import java.util.Map;
-
-import org.photonvision.targeting.PhotonTrackedTarget;
-
-import edu.wpi.first.math.controller.PIDController;
 import edu.wpi.first.wpilibj2.command.Command;
 import edu.wpi.first.wpilibj2.command.Commands;
-import frc.robot.Constants.RobotMovementConstants;
-import frc.robot.Constants.SwerveDrivetrainConstants;
 import frc.robot.Constants.AutoConstants;
 import frc.robot.subsystems.SwerveDrivetrain;
 import frc.robot.subsystems.Vision;
 import edu.wpi.first.math.geometry.Transform3d;
 import edu.wpi.first.math.geometry.Translation2d;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
-import edu.wpi.first.math.geometry.Rotation3d;
-import edu.wpi.first.math.geometry.Transform2d;
 import edu.wpi.first.math.geometry.Rotation2d;
 
 // How to make Command: https://compendium.readthedocs.io/en/latest/tasks/commands/commands.html (ignore image instructions, code is out of date, just look at written general instructions)