Merge branch 'main' of https://git.demerso.net/pls5618/2024/robot
This commit is contained in:
commit
e333273910
@ -73,7 +73,10 @@ public class RobotContainer {
|
||||
public RobotContainer() {
|
||||
dashboard.addCamera("limelight", "limelight","limelight.local:5800")
|
||||
.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("lancer", new LancerNote(lanceur, accumulateur));
|
||||
NamedCommands.registerCommand("piston", new PistonFerme(grimpeur));
|
||||
@ -107,10 +110,30 @@ public class RobotContainer {
|
||||
,grimpeur));
|
||||
|
||||
LED.setDefaultCommand(allumeLED);
|
||||
*/
|
||||
dashboard.add("autochooser",autoChooser)
|
||||
.withSize(2,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
|
||||
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user