Merge branch 'main' of https://demerso.net/pls5618/2023/betabots
This commit is contained in:
commit
2aeb4122b3
@ -11,6 +11,7 @@ import edu.wpi.first.wpilibj.XboxController;
|
|||||||
import edu.wpi.first.wpilibj.XboxController.Button;
|
import edu.wpi.first.wpilibj.XboxController.Button;
|
||||||
import edu.wpi.first.wpilibj2.command.Command;
|
import edu.wpi.first.wpilibj2.command.Command;
|
||||||
import edu.wpi.first.wpilibj2.command.RunCommand;
|
import edu.wpi.first.wpilibj2.command.RunCommand;
|
||||||
|
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
|
||||||
import edu.wpi.first.wpilibj2.command.button.JoystickButton;
|
import edu.wpi.first.wpilibj2.command.button.JoystickButton;
|
||||||
// subsystems
|
// subsystems
|
||||||
import frc.robot.subsystems.BasePilotable;
|
import frc.robot.subsystems.BasePilotable;
|
||||||
@ -19,9 +20,21 @@ import frc.robot.subsystems.Pistonshaker;
|
|||||||
// commands
|
// commands
|
||||||
import frc.robot.commands.Activer_poussoir;
|
import frc.robot.commands.Activer_poussoir;
|
||||||
import frc.robot.commands.ActiverBlockeur;
|
import frc.robot.commands.ActiverBlockeur;
|
||||||
|
<<<<<<< HEAD
|
||||||
import frc.robot.commands.Activer_poussoir;
|
import frc.robot.commands.Activer_poussoir;
|
||||||
|
=======
|
||||||
|
<<<<<<< HEAD
|
||||||
|
import frc.robot.commands.DesactiverBlockeur;
|
||||||
|
import frc.robot.commands.Reculer;
|
||||||
|
import frc.robot.commands.TournerDroite;
|
||||||
|
import frc.robot.commands.TournerGauche;
|
||||||
|
import frc.robot.commands.Activershaker;
|
||||||
|
import frc.robot.commands.Avancer;
|
||||||
|
=======
|
||||||
|
>>>>>>> db39b5c3db06eed46b45655b80bb22a24e971bb2
|
||||||
import frc.robot.commands.Activershaker;
|
import frc.robot.commands.Activershaker;
|
||||||
import frc.robot.commands.DesactiverBlockeur;
|
import frc.robot.commands.DesactiverBlockeur;
|
||||||
|
>>>>>>> 3d2fed7d28e2c16a03399281bc03d1cf3df4f6d1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -80,6 +93,18 @@ public class RobotContainer {
|
|||||||
*/
|
*/
|
||||||
public Command getAutonomousCommand() {
|
public Command getAutonomousCommand() {
|
||||||
// An ExampleCommand will run in autonomous
|
// An ExampleCommand will run in autonomous
|
||||||
return null;
|
return new SequentialCommandGroup(
|
||||||
|
new Reculer(basePilotable).withTimeout(0.5),
|
||||||
|
new TournerGauche(basePilotable).withTimeout(0.5),
|
||||||
|
new Avancer(basePilotable).withTimeout(0.5),
|
||||||
|
new TournerDroite(basePilotable).withTimeout(0.5),
|
||||||
|
new Avancer(basePilotable).withTimeout(0.5),
|
||||||
|
new TournerGauche(basePilotable).withTimeout(0.5),
|
||||||
|
new Avancer(basePilotable).withTimeout(0.5),
|
||||||
|
new TournerDroite(basePilotable).withTimeout(0.5),
|
||||||
|
new Avancer(basePilotable).withTimeout(0.5),
|
||||||
|
new Activer_poussoir(poussoir).withTimeout(0.3),
|
||||||
|
new Activershaker(pistonshaker)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user