Skip to content

Commit

Permalink
drive controllers
Browse files Browse the repository at this point in the history
  • Loading branch information
penguin212 committed Feb 7, 2024
1 parent 2cc0d28 commit e47785b
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,17 @@
import frc.robot.commands.shooter.pivot.ShooterPivotVerticalCommand;
import frc.robot.subsystems.climb.ClimbSubsystem;
import frc.robot.subsystems.elevator.ElevatorSubsystem;
import frc.robot.controllers.BaseDriveController;
import frc.robot.controllers.DualJoystickDriveController;
import frc.robot.controllers.XboxDriveController;
import frc.robot.subsystems.swerve.BaseSwerveSubsystem;
import frc.robot.subsystems.swerve.SingleModuleSwerveSubsystem;
import frc.robot.subsystems.swerve.SwerveModule;
import frc.robot.subsystems.swerve.SwerveSubsystem;
import frc.robot.subsystems.swerve.TestSingleModuleSwerveSubsystem;
import frc.robot.util.ConditionalWaitCommand;


import java.util.function.BooleanSupplier;
import com.choreo.lib.Choreo;
import com.choreo.lib.ChoreoTrajectory;
Expand All @@ -58,7 +62,7 @@
import edu.wpi.first.cscore.UsbCamera;
public class RobotContainer {
// The robot's subsystems and commands are defined here...
private final BaseDriveController driveController = new DualJoystickDriveController();
private final BaseDriveController driveController;
private final BaseSwerveSubsystem baseSwerveSubsystem;

private final IntakePivotSubsystem intakePivotSubsystem;
Expand Down Expand Up @@ -108,6 +112,7 @@ public RobotContainer() {
climbSubsystem = new ClimbSubsystem();

elevatorSubsystem = new ElevatorSubsystem();
driveController = new DualJoystickDriveController();

traj = Choreo.getTrajectory("Curve");

Expand Down

0 comments on commit e47785b

Please sign in to comment.