From 248d3fc93ac6147aa58fce6601d2ad11c4b9cd3f Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Mon, 13 Mar 2023 18:35:35 -0400 Subject: [PATCH 1/2] u --- src/main/java/frc/robot/RobotContainer.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 85ba30e..b1660c5 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -25,17 +25,22 @@ import frc.robot.subsystems.bras.BrasTelescopique; import frc.robot.subsystems.bras.Pince; import frc.robot.subsystems.bras.Pivot; import frc.robot.subsystems.Limelight; +import frc.robot.commands.Apriltag; // command import frc.robot.commands.BrakeFerme; import frc.robot.commands.BrakeOuvre; import frc.robot.commands.Cone; +import frc.robot.commands.Cube; import frc.robot.commands.GratteBaisser; import frc.robot.commands.GratteMonte; import frc.robot.commands.Gyro; import frc.robot.commands.Reculer; +import frc.robot.commands.Tape; import frc.robot.commands.bras.FermePince; import frc.robot.commands.bras.OuvrePince; import frc.robot.commands.bras.PivotBrasRentre; +import frc.robot.commands.bras.PivotChercheBas; +import frc.robot.commands.bras.PivotChercheHaut; import frc.robot.commands.bras.PivoteBrasBas; import frc.robot.commands.bras.PivoteBrasHaut; import frc.robot.commands.bras.PivoteBrasMilieux; @@ -87,14 +92,12 @@ public RobotContainer() { chooser.addOption(aumilieux, aumilieux); chooser.addOption(nulpart, nulpart); layoutauto.add("choix hauteur",chooser); - - configureBindings(); CameraServer.startAutomaticCapture(); teb.add (CameraServer.startAutomaticCapture(null, 0)); - basePilotable.setDefaultCommand(new RunCommand() -> { - basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX(), 0); - } + basePilotable.setDefaultCommand(new RunCommand()-> + basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX(), 0)); + } private void configureBindings() { // manette 1 From d39a7fa643a735bc9d34e71b5551b26e62ef5234 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Mon, 13 Mar 2023 18:38:08 -0400 Subject: [PATCH 2/2] re --- src/main/java/frc/robot/RobotContainer.java | 20 ------------------- src/main/java/frc/robot/commands/Reculer.java | 3 --- 2 files changed, 23 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 77f4881..a7d5a4c 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -18,7 +18,6 @@ import edu.wpi.first.wpilibj2.command.InstantCommand; import edu.wpi.first.wpilibj2.command.RunCommand; import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; import edu.wpi.first.wpilibj2.command.button.CommandXboxController; -<<<<<<< HEAD //subsystems import frc.robot.subsystems.BasePilotable; @@ -28,10 +27,6 @@ import frc.robot.subsystems.bras.Pince; import frc.robot.subsystems.bras.Pivot; import frc.robot.subsystems.Limelight; import frc.robot.commands.Apriltag; -======= -import frc.robot.commands.Apriltag; -import frc.robot.commands.Avancer; ->>>>>>> de5b5213cba2b66ec7b8cc5e73c1bf9123dd259b // command import frc.robot.commands.BrakeFerme; import frc.robot.commands.BrakeOuvre; @@ -50,13 +45,6 @@ import frc.robot.commands.bras.PivotChercheHaut; import frc.robot.commands.bras.PivoteBrasBas; import frc.robot.commands.bras.PivoteBrasHaut; import frc.robot.commands.bras.PivoteBrasMilieux; -//subsystems -import frc.robot.subsystems.BasePilotable; -import frc.robot.subsystems.Gratte; -import frc.robot.subsystems.Limelight; -import frc.robot.subsystems.bras.BrasTelescopique; -import frc.robot.subsystems.bras.Pince; -import frc.robot.subsystems.bras.Pivot; public class RobotContainer { @@ -115,18 +103,10 @@ public RobotContainer() { layoutauto.add("choix hauteur",chooser); configureBindings(); CameraServer.startAutomaticCapture(); -<<<<<<< HEAD - teb.add (CameraServer.startAutomaticCapture(null, 0)); - basePilotable.setDefaultCommand(new RunCommand()-> - basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX(), 0)); - - } -======= basePilotable.setDefaultCommand(new RunCommand(() -> { basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX()); })); } ->>>>>>> de5b5213cba2b66ec7b8cc5e73c1bf9123dd259b private void configureBindings() { // manette 1 manette1.a().toggleOnTrue(Commands.startEnd(pince::ouvrir, pince::fermer,pince)); diff --git a/src/main/java/frc/robot/commands/Reculer.java b/src/main/java/frc/robot/commands/Reculer.java index 46aab87..e9d245b 100644 --- a/src/main/java/frc/robot/commands/Reculer.java +++ b/src/main/java/frc/robot/commands/Reculer.java @@ -7,9 +7,6 @@ package frc.robot.commands; import java.util.function.DoubleSupplier; -import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; -import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.CommandBase; import frc.robot.subsystems.BasePilotable;