fix weird conflict

redshiftrobotics · Nov 12, 2024 · 7cc4202 · 7cc4202
1 parent cddc4ae
commit 7cc4202
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
@@ -40,7 +40,7 @@
 import frc.robot.subsystems.drive.controllers.SpeedController.SpeedLevel;
 import frc.robot.subsystems.drive.controllers.TeleopDriveController;
 import frc.robot.subsystems.vision.AprilTagVision;
-import frc.robot.subsystems.vision.CameraIOPhotonVision;
+import frc.robot.subsystems.vision.CameraIOSim;
 import frc.robot.subsystems.vision.VisionConstants;
 import frc.robot.utility.OverrideSwitch;
 import frc.robot.utility.logging.Alert;
@@ -200,9 +200,6 @@ private void initDashboard() {
     dashboard.addCommand("Reset Pose", () -> drive.resetPose(new Pose2d()), true);
     dashboard.addCommand("Zero Gyro", drive::zeroGyro, true);
 
-    dashboard.addCommand("Arm Stow", () -> arm.setGoal(Arm.Goal.STOW), false);
-    dashboard.addCommand("Arm Up", () -> arm.setGoal(Arm.Goal.UP), false);
-
     dashboard.addCommand(
         "Pathfind To Speaker",
         AutoBuilder.pathfindToPose(