Merge branch 'main' of https://git.demerso.net/pls5618/2024/robot
This commit is contained in:
		| @@ -72,7 +72,7 @@ public class RobotContainer { | ||||
|   Lancerampli lancerampli = new Lancerampli(lanceur,limelight); | ||||
|    GrimpeurDroit grimpeurDroit = new GrimpeurDroit(grimpeur, manette::getLeftX); | ||||
|   GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getLeftY); | ||||
|   AllumeLED allumeLED = new AllumeLED(LED); | ||||
|   AllumeLED allumeLED = new AllumeLED(LED, accumulateur);  | ||||
|   Pistongrimpeur pistongrimpeur = new Pistongrimpeur(grimpeur, LED); | ||||
|   public RobotContainer() { | ||||
|     dashboard.addCamera("limelight", "limelight","limelight.local:5800"); | ||||
|   | ||||
| @@ -12,7 +12,7 @@ public class AllumeLED extends Command { | ||||
|   private LED led; | ||||
|   private Accumulateur accumulateur; | ||||
|   /** Creates a new AllumeLED. */ | ||||
|   public AllumeLED(LED led) { | ||||
|   public AllumeLED(LED led,Accumulateur accumulateur){ | ||||
|     this.accumulateur = accumulateur; | ||||
|     this.led = led; | ||||
|     addRequirements(led); | ||||
|   | ||||
| @@ -45,7 +45,7 @@ public class GrimpeurDroit extends Command { | ||||
|   else{ | ||||
|     grimpeur.droit(0); | ||||
|   } | ||||
|   if(grimpeur.encoderd()>0){ | ||||
|   if(grimpeur.encoderd()>1){ | ||||
|     grimpeur.resetencodeurd(); | ||||
|     grimpeur.droit(0); | ||||
|      | ||||
|   | ||||
| @@ -44,7 +44,7 @@ public class GrimpeurGauche extends Command { | ||||
|     else{ | ||||
|       grimpeur.gauche(0); | ||||
|     } | ||||
|     if(grimpeur.encoderd()>0){ | ||||
|     if(grimpeur.encoderd()>1){ | ||||
|       grimpeur.resetencodeurg(); | ||||
|       grimpeur.gauche(0); | ||||
|        | ||||
|   | ||||
		Reference in New Issue
	
	Block a user