From 74b72fd992a34256bbdde8e8c54d0824d658b49e Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Fri, 29 Nov 2024 12:02:54 -0500 Subject: [PATCH] m --- src/main/java/frc/robot/RobotContainer.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index ce15bfc..20867d2 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -23,7 +23,7 @@ import frc.robot.Subsystems.Lanceur; import frc.robot.Subsystems.Limelight3G; public class RobotContainer { -// private final SendableChooser autoChooser; + private final SendableChooser autoChooser; Lanceur lanceur= new Lanceur(); Accumulateur accumulateur = new Accumulateur(); Limelight3G limelight3G = new Limelight3G(); @@ -31,8 +31,8 @@ public class RobotContainer { ShuffleboardTab dashboard = Shuffleboard.getTab("dashboard"); CommandXboxController manette = new CommandXboxController(0); public RobotContainer() { - // NamedCommands.registerCommand("lancer", new Lancer(lanceur, accumulateur)); - // autoChooser = AutoBuilder.buildAutoChooser(); + NamedCommands.registerCommand("lancer", new Lancer(lanceur, accumulateur)); + autoChooser = AutoBuilder.buildAutoChooser(); dashboard.addCamera("limelight3G", "limelight3G","limelight.local:5800") .withSize(3,4) .withPosition(5,0); @@ -43,15 +43,9 @@ public class RobotContainer { drive.setDefaultCommand(new RunCommand(()->{ drive.drive(-MathUtil.applyDeadband(manette.getRightX(),0.2), MathUtil.applyDeadband(-manette.getRightY(),0.2), MathUtil.applyDeadband(-manette.getRightX(), 0.2)); },drive)); -<<<<<<< HEAD - // dashboard.add("autochooser",autoChooser) - // .withSize(1,1) - // .withPosition(6,0); -======= dashboard.add("autochooser",autoChooser) .withSize(1,1) - .withPosition(8,0); ->>>>>>> 3f240407849e489fb0b5fae52b61719f27c7b388 + .withPosition(8,0); } private void configureBindings() {