c
This commit is contained in:
		| @@ -6,7 +6,6 @@ package frc.robot; | ||||
|  | ||||
| import edu.wpi.first.wpilibj2.command.Command; | ||||
| import edu.wpi.first.wpilibj2.command.Commands; | ||||
| <<<<<<< HEAD | ||||
| import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; | ||||
| import edu.wpi.first.wpilibj2.command.RunCommand; | ||||
| import edu.wpi.first.wpilibj2.command.button.CommandXboxController; | ||||
| @@ -64,23 +63,6 @@ PivoteBrasMilieux pivoteBrasMilieux = new PivoteBrasMilieux(brasTelescopique, pi | ||||
| PivoteBrasHaut pivoteBrasHaut = new PivoteBrasHaut(brasTelescopique, pivot); | ||||
| Cone cone = new Cone(limelight, basePilotable, ()->-manette1.getLeftY()); | ||||
| public RobotContainer() { | ||||
| ======= | ||||
| import frc.robot.subsystems.BasePilotable; | ||||
| import frc.robot.subsystems.Gratte; | ||||
| import frc.robot.subsystems.Limelight; | ||||
| import frc.robot.subsystems.bras.BrasTelescopique; | ||||
| import frc.robot.subsystems.bras.Pince; | ||||
| import frc.robot.subsystems.bras.Pivot; | ||||
|  | ||||
| public class RobotContainer { | ||||
|   BasePilotable basePilotable = new BasePilotable(); | ||||
|   Gratte gratte = new Gratte(); | ||||
|   BrasTelescopique brasTelescopique = new BrasTelescopique(); | ||||
|   Pince pince = new Pince(); | ||||
|   Pivot pivot = new Pivot(); | ||||
|   Limelight limelight = new Limelight(); | ||||
|   public RobotContainer() { | ||||
| >>>>>>> Dash | ||||
|     configureBindings(); | ||||
|  | ||||
|     basePilotable.setDefaultCommand(new RunCommand(() -> { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user