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:
samuel desharnais 2024-02-22 17:49:32 -05:00
commit e9f33581fa
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,17 +52,20 @@ public class RobotContainer {
Guideur guideur = new Guideur(); Guideur guideur = new Guideur();
Lanceur lanceur = new Lanceur(); Lanceur lanceur = new Lanceur();
Limelight limelight = new Limelight(); Limelight limelight = new Limelight();
//joystick
CommandJoystick joystick = new CommandJoystick(0); CommandJoystick joystick = new CommandJoystick(0);
CommandXboxController manette = new CommandXboxController(1); CommandXboxController manette = new CommandXboxController(1);
//command //command
PistonFerme pistonFerme = new PistonFerme(grimpeur); PistonFerme pistonFerme = new PistonFerme(grimpeur);
Balayer balayer = new Balayer(balayeuse, accumulateur); Balayer balayer = new Balayer(balayeuse, accumulateur);
GuiderHaut guiderHaut = new GuiderHaut(guideur); GuiderHaut guiderHaut = new GuiderHaut(guideur);
GuiderBas guiderBas = new GuiderBas(guideur); GuiderBas guiderBas = new GuiderBas(guideur);
Lancer lancer = new Lancer(lanceur,limelight); Lancer lancer = new Lancer(lanceur,limelight);
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::getLeftY); GrimpeurDroit grimpeurDroit = new GrimpeurDroit(grimpeur, manette::getLeftY);
GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getRightY); GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getRightY);
public RobotContainer() { public RobotContainer() {

2
src/main/java/frc/robot/subsystem/Limelight.java
View File

@ -25,7 +25,7 @@ public class Limelight extends SubsystemBase {
public Limelight() { public Limelight() {
for (int port = 5800; port <= 5807; port++) { for (int port = 5800; port <= 5807; port++) {
PortForwarder.add(port, "limelight.local", port); PortForwarder.add(port, "limelight.local", port);
} }
} }
public double getx(){ public double getx(){