PLS5618/pratique-2025
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: PLS5618:f7daa030bd42eff4d4bc0a6a72e7cc0e2ee62f0c
Branches Tags
PLS5618:main
PLS5618:Lanceur
..
compare: PLS5618:3f240407849e489fb0b5fae52b61719f27c7b388
Branches Tags
PLS5618:main
PLS5618:Lanceur

No commits in common. "f7daa030bd42eff4d4bc0a6a72e7cc0e2ee62f0c" and "3f240407849e489fb0b5fae52b61719f27c7b388" have entirely different histories.
f7daa030bd ... 3f24040784

1 changed files with 6 additions and 12 deletions
Show Stats Expand all files Collapse all files

18
src/main/java/frc/robot/RobotContainer.java
View File

@ -4,8 +4,8 @@
package frc.robot; package frc.robot;
//import com.pathplanner.lib.auto.AutoBuilder; import com.pathplanner.lib.auto.AutoBuilder;
//import com.pathplanner.lib.auto.NamedCommands; import com.pathplanner.lib.auto.NamedCommands;
import edu.wpi.first.math.MathUtil; import edu.wpi.first.math.MathUtil;
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
@ -23,7 +23,7 @@ import frc.robot.Subsystems.Lanceur;
import frc.robot.Subsystems.Limelight3G; import frc.robot.Subsystems.Limelight3G;
public class RobotContainer { public class RobotContainer {
// private final SendableChooser<Command> autoChooser; private final SendableChooser<Command> autoChooser;
Lanceur lanceur= new Lanceur(); Lanceur lanceur= new Lanceur();
Accumulateur accumulateur = new Accumulateur(); Accumulateur accumulateur = new Accumulateur();
Limelight3G limelight3G = new Limelight3G(); Limelight3G limelight3G = new Limelight3G();
@ -31,8 +31,8 @@ public class RobotContainer {
ShuffleboardTab dashboard = Shuffleboard.getTab("dashboard"); ShuffleboardTab dashboard = Shuffleboard.getTab("dashboard");
CommandXboxController manette = new CommandXboxController(0); CommandXboxController manette = new CommandXboxController(0);
public RobotContainer() { public RobotContainer() {
// NamedCommands.registerCommand("lancer", new Lancer(lanceur, accumulateur)); NamedCommands.registerCommand("lancer", new Lancer(lanceur, accumulateur));
// autoChooser = AutoBuilder.buildAutoChooser(); autoChooser = AutoBuilder.buildAutoChooser();
dashboard.addCamera("limelight3G", "limelight3G","limelight.local:5800") dashboard.addCamera("limelight3G", "limelight3G","limelight.local:5800")
.withSize(3,4) .withSize(3,4)
.withPosition(5,0); .withPosition(5,0);
@ -43,15 +43,9 @@ public class RobotContainer {
drive.setDefaultCommand(new RunCommand(()->{ 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.drive(-MathUtil.applyDeadband(manette.getRightX(),0.2), MathUtil.applyDeadband(-manette.getRightY(),0.2), MathUtil.applyDeadband(-manette.getRightX(), 0.2));
},drive)); },drive));
<<<<<<< HEAD
// dashboard.add("autochooser",autoChooser)
// .withSize(1,1)
// .withPosition(6,0);
=======
dashboard.add("autochooser",autoChooser) dashboard.add("autochooser",autoChooser)
.withSize(1,1) .withSize(1,1)
.withPosition(8,0); .withPosition(8,0);
>>>>>>> 3f240407849e489fb0b5fae52b61719f27c7b388
} }
private void configureBindings() { private void configureBindings() {
@ -62,6 +56,6 @@ public class RobotContainer {
} }
public Command getAutonomousCommand() { public Command getAutonomousCommand() {
return null; return autoChooser.getSelected();
} }
} }