Merge branch 'main' of https://git.demerso.net/pls5618/2024/robot
This commit is contained in:
commit
71849c6267
@ -18,6 +18,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Solenoids": {
|
"Solenoids": {
|
||||||
|
"0": {
|
||||||
|
"header": {
|
||||||
|
"open": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"window": {
|
"window": {
|
||||||
"visible": true
|
"visible": true
|
||||||
}
|
}
|
||||||
|
@ -71,7 +71,7 @@ public class RobotContainer {
|
|||||||
LancerNote lancernote = new LancerNote(lanceur, accumulateur);
|
LancerNote lancernote = new LancerNote(lanceur, accumulateur);
|
||||||
Lancerampli lancerampli = new Lancerampli(lanceur,limelight);
|
Lancerampli lancerampli = new Lancerampli(lanceur,limelight);
|
||||||
GrimpeurDroit grimpeurDroit = new GrimpeurDroit(grimpeur, manette::getLeftX);
|
GrimpeurDroit grimpeurDroit = new GrimpeurDroit(grimpeur, manette::getLeftX);
|
||||||
GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getLeftY);
|
GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getRightX);
|
||||||
AllumeLED allumeLED = new AllumeLED(LED, accumulateur);
|
AllumeLED allumeLED = new AllumeLED(LED, accumulateur);
|
||||||
Pistongrimpeur pistongrimpeur = new Pistongrimpeur(grimpeur, LED);
|
Pistongrimpeur pistongrimpeur = new Pistongrimpeur(grimpeur, LED);
|
||||||
public RobotContainer() {
|
public RobotContainer() {
|
||||||
@ -93,8 +93,10 @@ public class RobotContainer {
|
|||||||
drive.drive(-MathUtil.applyDeadband(joystick.getY(),0.2), MathUtil.applyDeadband(-joystick.getX(),0.2), MathUtil.applyDeadband(-joystick.getZ(), 0.2));
|
drive.drive(-MathUtil.applyDeadband(joystick.getY(),0.2), MathUtil.applyDeadband(-joystick.getX(),0.2), MathUtil.applyDeadband(-joystick.getZ(), 0.2));
|
||||||
},drive));
|
},drive));
|
||||||
grimpeur.setDefaultCommand(new RunCommand(()->{
|
grimpeur.setDefaultCommand(new RunCommand(()->{
|
||||||
grimpeur.droit(manette.getLeftX());}
|
grimpeur.droit(manette.getLeftX());
|
||||||
|
grimpeur.gauche(manette.getRightX());}
|
||||||
,grimpeur));
|
,grimpeur));
|
||||||
|
|
||||||
LED.setDefaultCommand(allumeLED);
|
LED.setDefaultCommand(allumeLED);
|
||||||
dashboard.add("autochooser",autoChooser)
|
dashboard.add("autochooser",autoChooser)
|
||||||
.withSize(2,1)
|
.withSize(2,1)
|
||||||
|
@ -35,7 +35,7 @@ public class Grimpeur extends SubsystemBase {
|
|||||||
final Solenoid pistondgauche = new Solenoid(PneumaticsModuleType.CTREPCM, Constants.pistondgaucheouvre);
|
final Solenoid pistondgauche = new Solenoid(PneumaticsModuleType.CTREPCM, Constants.pistondgaucheouvre);
|
||||||
//fonction
|
//fonction
|
||||||
public Grimpeur() {
|
public Grimpeur() {
|
||||||
|
pistonouvre();
|
||||||
layout.add("grimpeurencodeurd", encoderd());
|
layout.add("grimpeurencodeurd", encoderd());
|
||||||
layout.add("grimpeurencodeurg", encoderg());
|
layout.add("grimpeurencodeurg", encoderg());
|
||||||
layout.add("pitchgyrogrimpeur", getpitch());
|
layout.add("pitchgyrogrimpeur", getpitch());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user