PLS5618/robot-2023
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gvnbm

Browse Source
This commit is contained in:
samuel desharnais
2023-03-21 18:06:31 -04:00
parent bc0f4c4e9a
commit 74a26d4454
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,14 +88,9 @@ public class RobotContainer {
Cube cube = new Cube(limelight, basePilotable, () -> manette1.getLeftY()); Cube cube = new Cube(limelight, basePilotable, () -> manette1.getLeftY());
Apriltag aprilTag = new Apriltag(limelight, basePilotable, () -> manette1.getLeftY()); Apriltag aprilTag = new Apriltag(limelight, basePilotable, () -> manette1.getLeftY());
Tape tape = new Tape(limelight, basePilotable, () -> manette1.getLeftY()); Tape tape = new Tape(limelight, basePilotable, () -> manette1.getLeftY());
<<<<<<< HEAD
PivotManuel pivotManuel = new PivotManuel(pivot, manette1::getRightY); PivotManuel pivotManuel = new PivotManuel(pivot, manette1::getRightY);
BrasManuel brasManuel = new BrasManuel(brasTelescopique, manette1::getRightX); BrasManuel brasManuel = new BrasManuel(brasTelescopique, manette1::getRightX);
=======
PivotManuel pivotManuel = new PivotManuel(pivot, manette1::getLeftY);
BrasManuel brasManuel = new BrasManuel(brasTelescopique, manette1::getLeftX);
ActiverLimeLight activerLimeLight = new ActiverLimeLight(limelight); ActiverLimeLight activerLimeLight = new ActiverLimeLight(limelight);
>>>>>>> 1da49837db76e3ae31f03d0e1593aec704cc02df
public RobotContainer() { public RobotContainer() {
chooser.addOption(enhaut, enhaut); chooser.addOption(enhaut, enhaut);
@@ -123,12 +118,8 @@ public class RobotContainer {
manette1.povDown().whileTrue(creerCommandBras(9, -14)); manette1.povDown().whileTrue(creerCommandBras(9, -14));
manette1.povRight().whileTrue(creerCommandBras(44, -17)); manette1.povRight().whileTrue(creerCommandBras(44, -17));
manette1.povLeft().whileTrue(creerCommandBras(0, 0)); manette1.povLeft().whileTrue(creerCommandBras(0, 0));
<<<<<<< HEAD
// manette 2
=======
manette1.y().whileTrue(activerLimeLight); manette1.y().whileTrue(activerLimeLight);
//manette 2 //manette 2
>>>>>>> 1da49837db76e3ae31f03d0e1593aec704cc02df
manette2.povDown().whileTrue(creerCommandBras(9, -18)); manette2.povDown().whileTrue(creerCommandBras(9, -18));
manette2.povUp().whileTrue(creerCommandBras(44, 0)); manette2.povUp().whileTrue(creerCommandBras(44, 0));
manette2.rightBumper().whileTrue(cube); manette2.rightBumper().whileTrue(cube);
@@ -151,7 +142,7 @@ public class RobotContainer {
chooser.getSelected(); chooser.getSelected();
autobalance.getBoolean(true); autobalance.getBoolean(true);
return Commands.deadline( return Commands.deadline(
Commands.waitSeconds(14.6), Commands.waitSeconds(14),
new SequentialCommandGroup( new SequentialCommandGroup(
Commands.select(Map.ofEntries( Commands.select(Map.ofEntries(
Map.entry(enhaut, creerCommandBras(51, -40)), Map.entry(enhaut, creerCommandBras(51, -40)),