s
This commit is contained in:
parent
69afbb068a
commit
7a8dfb3a13
@ -71,13 +71,8 @@ public class RobotContainer {
|
||||
LancerNote lancernote = new LancerNote(lanceur, accumulateur);
|
||||
Lancerampli lancerampli = new Lancerampli(lanceur,limelight);
|
||||
GrimpeurDroit grimpeurDroit = new GrimpeurDroit(grimpeur, manette::getLeftX);
|
||||
<<<<<<< HEAD
|
||||
GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getLeftY);
|
||||
AllumeLED allumeLED = new AllumeLED(LED,accumulateur);
|
||||
=======
|
||||
GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getRightX);
|
||||
AllumeLED allumeLED = new AllumeLED(LED, accumulateur);
|
||||
>>>>>>> 7a37782ca19fb71cb842174cd8fcd536eda825a9
|
||||
Pistongrimpeur pistongrimpeur = new Pistongrimpeur(grimpeur, LED);
|
||||
public RobotContainer() {
|
||||
dashboard.addCamera("limelight", "limelight","limelight.local:5800");
|
||||
|
Loading…
x
Reference in New Issue
Block a user