Merge branch 'main' of https://git.demerso.net/PLS5618/Reefscape-2025
This commit is contained in:
commit
b50c5be7de
@ -137,6 +137,7 @@ public class RobotContainer {
|
|||||||
|
|
||||||
//pince
|
//pince
|
||||||
manette2.a().whileTrue(new CorailAspir(pince));
|
manette2.a().whileTrue(new CorailAspir(pince));
|
||||||
|
manette2.start().whileTrue(new reset(elevateur, pince));
|
||||||
manette2.b().whileTrue(new Algue_inspire(pince));
|
manette2.b().whileTrue(new Algue_inspire(pince));
|
||||||
manette2.start().whileTrue(new reset(elevateur,pince));
|
manette2.start().whileTrue(new reset(elevateur,pince));
|
||||||
manette2.leftTrigger().whileTrue(new AlgueExpire(pince, bougie));
|
manette2.leftTrigger().whileTrue(new AlgueExpire(pince, bougie));
|
||||||
|
@ -23,7 +23,7 @@ public class L2 extends Command {
|
|||||||
private DoubleSubscriber encodeur1 = tabelevateur.getDoubleTopic("encodeurelevateurbasL2").subscribe(-1);
|
private DoubleSubscriber encodeur1 = tabelevateur.getDoubleTopic("encodeurelevateurbasL2").subscribe(-1);
|
||||||
private DoubleSubscriber encodeur2 = tabelevateur.getDoubleTopic("encodeurelevateurhautL2").subscribe(-0.9);
|
private DoubleSubscriber encodeur2 = tabelevateur.getDoubleTopic("encodeurelevateurhautL2").subscribe(-0.9);
|
||||||
private DoubleSubscriber encodeur3 = tabelevateur.getDoubleTopic("encodeurpincebasL2").subscribe(-1);
|
private DoubleSubscriber encodeur3 = tabelevateur.getDoubleTopic("encodeurpincebasL2").subscribe(-1);
|
||||||
private DoubleSubscriber encodeur4 = tabelevateur.getDoubleTopic("encodeur pince haut L2").subscribe(-0.9);
|
private DoubleSubscriber encodeur4 = tabelevateur.getDoubleTopic("encodeurpinceautL2").subscribe(-0.9);
|
||||||
/** Creates a new L2. */
|
/** Creates a new L2. */
|
||||||
public L2(Elevateur elevateur,Pince pince) {
|
public L2(Elevateur elevateur,Pince pince) {
|
||||||
this.elevateur = elevateur;
|
this.elevateur = elevateur;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user