From 74a26d445462a27537933e724c6a7b0ad41506a4 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Tue, 21 Mar 2023 18:06:31 -0400 Subject: [PATCH] gvnbm --- src/main/java/frc/robot/RobotContainer.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 11a419e..1d6d016 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -88,14 +88,9 @@ public class RobotContainer { Cube cube = new Cube(limelight, basePilotable, () -> manette1.getLeftY()); Apriltag aprilTag = new Apriltag(limelight, basePilotable, () -> manette1.getLeftY()); Tape tape = new Tape(limelight, basePilotable, () -> manette1.getLeftY()); -<<<<<<< HEAD PivotManuel pivotManuel = new PivotManuel(pivot, manette1::getRightY); 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); ->>>>>>> 1da49837db76e3ae31f03d0e1593aec704cc02df public RobotContainer() { chooser.addOption(enhaut, enhaut); @@ -123,12 +118,8 @@ public class RobotContainer { manette1.povDown().whileTrue(creerCommandBras(9, -14)); manette1.povRight().whileTrue(creerCommandBras(44, -17)); manette1.povLeft().whileTrue(creerCommandBras(0, 0)); -<<<<<<< HEAD - // manette 2 -======= manette1.y().whileTrue(activerLimeLight); //manette 2 ->>>>>>> 1da49837db76e3ae31f03d0e1593aec704cc02df manette2.povDown().whileTrue(creerCommandBras(9, -18)); manette2.povUp().whileTrue(creerCommandBras(44, 0)); manette2.rightBumper().whileTrue(cube); @@ -151,7 +142,7 @@ public class RobotContainer { chooser.getSelected(); autobalance.getBoolean(true); return Commands.deadline( - Commands.waitSeconds(14.6), + Commands.waitSeconds(14), new SequentialCommandGroup( Commands.select(Map.ofEntries( Map.entry(enhaut, creerCommandBras(51, -40)),