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

Merge branch 'main' of https://git.demerso.net/pls5618/2024/robot

Browse Source
This commit is contained in:
Olivier Dubois
2024-01-30 19:52:46 -05:00
parent 9303d6f87a 33990971eb
commit 866954c0d9
6 changed files with 115 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,12 @@ import edu.wpi.first.wpilibj2.command.RunCommand;
// Manette
import edu.wpi.first.wpilibj2.command.button.CommandJoystick;
import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
<<<<<<< HEAD
import frc.robot.command.Balayer;
=======
import frc.robot.command.GuiderBas;
import frc.robot.command.GuiderHaut;
>>>>>>> 33990971eb46b4232501c29b34451800e658504b
// Subsystem
import frc.robot.subsystem.Accumulateur;
import frc.robot.subsystem.Balayeuse;
@@ -33,13 +38,16 @@ public class RobotContainer {
Lanceur lanceur = new Lanceur();
Balayer balayer = new Balayer(balayeuse, accumulateur);
GuiderHaut guiderHaut = new GuiderHaut(guideur);
GuiderBas guiderBas = new GuiderBas(guideur);
CommandJoystick joystick = new CommandJoystick(0);
CommandXboxController manette = new CommandXboxController(1);
public RobotContainer() {
CameraServer.startAutomaticCapture();
manette.a().onTrue(guiderBas);
manette.b().onTrue(guiderHaut);
configureBindings();
drive.setDefaultCommand(new RunCommand(()->{
drive.drive(-MathUtil.applyDeadband(joystick.getY(),0.2), MathUtil.applyDeadband(-joystick.getX(),0.2), MathUtil.applyDeadband(-joystick.getZ(), 0.2));