From 2f874c8196094a65dd016174dda253bff80e7290 Mon Sep 17 00:00:00 2001
From: Imeanbusiness <dominic.adam.koh@gmail.com>
Date: Mon, 26 Feb 2024 18:42:19 -0800
Subject: [PATCH] Robot driving improvements

---
 src/main/java/frc/robot/RobotContainer.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index ae73654..2497de5 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -50,14 +50,14 @@ public class RobotContainer {
     private final Command shooterSpinUp = new ShooterSpinUp(shooter);
 
     private final SequentialCommandGroup ampScore = new SequentialCommandGroup(
-        elevatorUp,
-        intakeEject,
-        elevatorDown
+        new ElevatorUp(elevator),
+        new IntakeAmpScore(intake),
+        new ElevatorDown(elevator)
     );
 
     private final ParallelCommandGroup speakerScore = new ParallelCommandGroup(
-        shooterSpinUp,
-        Commands.waitSeconds(2).andThen(intakeShooterFeed)
+        new ShooterSpinUp(shooter),
+        Commands.waitSeconds(2).andThen(new IntakeShooterFeed(intake))
     );
 
     SendableChooser<Command> autoSelector = new SendableChooser<>();
@@ -85,6 +85,7 @@ private void configureSubsystemCommands() {
         controller.getLeftBumper().onTrue(intakeEject);
         controller.getRightBumper().whileTrue(intakePickup);
 
+        controller.getX().onTrue(elevatorUp);
         controller.getA().onTrue(ampScore);
         controller.getB().onTrue(speakerScore);