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-20 17:51:09 -05:00
commit e333273910
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,10 @@ public class RobotContainer {
public RobotContainer() { public RobotContainer() {
dashboard.addCamera("limelight", "limelight","limelight.local:5800") dashboard.addCamera("limelight", "limelight","limelight.local:5800")
.withSize(3,4) .withSize(3,4)
.withPosition(7,0); .withPosition(7,0);
dashboard.addCamera("USB Camera 0", "USB Camera 0","http://roborio-5618-frc.local:1181/?action=stream")
.withSize(4, 4)
.withPosition(3, 0);
NamedCommands.registerCommand("balayer",new Balayer(balayeuse, accumulateur)); NamedCommands.registerCommand("balayer",new Balayer(balayeuse, accumulateur));
NamedCommands.registerCommand("lancer", new LancerNote(lanceur, accumulateur)); NamedCommands.registerCommand("lancer", new LancerNote(lanceur, accumulateur));
NamedCommands.registerCommand("piston", new PistonFerme(grimpeur)); NamedCommands.registerCommand("piston", new PistonFerme(grimpeur));
@ -107,10 +110,30 @@ public class RobotContainer {
,grimpeur)); ,grimpeur));
LED.setDefaultCommand(allumeLED); LED.setDefaultCommand(allumeLED);
*/
dashboard.add("autochooser",autoChooser) dashboard.add("autochooser",autoChooser)
.withSize(2,1) .withSize(2,1)
.withPosition(1,1); .withPosition(1,1);
<<<<<<< HEAD
=======
manette
.a()
.and(manette.rightBumper())
.whileTrue(lanceur.sysIdQuasistatic(SysIdRoutine.Direction.kForward));
manette
.b()
.and(manette.rightBumper())
.whileTrue(lanceur.sysIdQuasistatic(SysIdRoutine.Direction.kReverse));
manette
.x()
.and(manette.rightBumper())
.whileTrue(lanceur.sysIdDynamic(SysIdRoutine.Direction.kForward));
manette
.y()
.and(manette.rightBumper())
.whileTrue(lanceur.sysIdDynamic(SysIdRoutine.Direction.kReverse));
>>>>>>> c93da60343b8810f6391280759f99f9dcc7ff690
} }