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

k,

Browse Source
This commit is contained in:
Olivier Dubois
2024-01-30 19:53:18 -05:00
parent 866954c0d9
commit 442b537517
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,12 +13,9 @@ import edu.wpi.first.wpilibj2.command.RunCommand;
// Manette // Manette
import edu.wpi.first.wpilibj2.command.button.CommandJoystick; import edu.wpi.first.wpilibj2.command.button.CommandJoystick;
import edu.wpi.first.wpilibj2.command.button.CommandXboxController; import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
<<<<<<< HEAD
import frc.robot.command.Balayer; import frc.robot.command.Balayer;
=======
import frc.robot.command.GuiderBas; import frc.robot.command.GuiderBas;
import frc.robot.command.GuiderHaut; import frc.robot.command.GuiderHaut;
>>>>>>> 33990971eb46b4232501c29b34451800e658504b
// Subsystem // Subsystem
import frc.robot.subsystem.Accumulateur; import frc.robot.subsystem.Accumulateur;
import frc.robot.subsystem.Balayeuse; import frc.robot.subsystem.Balayeuse;
@@ -37,9 +34,9 @@ public class RobotContainer {
Guideur guideur = new Guideur(); Guideur guideur = new Guideur();
Lanceur lanceur = new Lanceur(); Lanceur lanceur = new Lanceur();
Balayer balayer = new Balayer(balayeuse, accumulateur); Balayer balayer = new Balayer(balayeuse, accumulateur);
GuiderHaut guiderHaut = new GuiderHaut(guideur); GuiderHaut guiderHaut = new GuiderHaut(guideur);
GuiderBas guiderBas = new GuiderBas(guideur); GuiderBas guiderBas = new GuiderBas(guideur);
CommandJoystick joystick = new CommandJoystick(0); CommandJoystick joystick = new CommandJoystick(0);
CommandXboxController manette = new CommandXboxController(1); CommandXboxController manette = new CommandXboxController(1);