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

Merge branch 'main' of https://git.demerso.net/pls5618/2024/robot

Browse Source
This commit is contained in:
Antoine PerreaultE
2024-02-12 18:11:57 -05:00
parent f86be6301c d9e9c2af4d
commit f19e11aaf6
5 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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");

2
src/main/java/frc/robot/command/AllumeLED.java
View File

@ -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);

2
src/main/java/frc/robot/command/GrimpeurDroit.java
View File

@ -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);

2
src/main/java/frc/robot/command/GrimpeurGauche.java
View File

@ -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);