wQA

src/main/java/frc/robot/commands/Reculer.java

@@ -5,6 +5,7 @@
 package frc.robot.commands;
 
 
+import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import edu.wpi.first.wpilibj2.command.CommandBase;
 import frc.robot.subsystems.BasePilotable;
 
@@ -26,7 +27,7 @@ public class Reculer extends CommandBase {
   // Called every time the scheduler runs while the command is scheduled.
   @Override
   public void execute() {
-    basePilotable.drive(0.2, 0);
+    basePilotable.drive(SmartDashboard.getNumber("vitesse auto", -0.3), 0);
   }
 
   // Called once the command ends or is interrupted.

src/main/java/frc/robot/subsystems/Gratte.java

@@ -7,10 +7,7 @@ package frc.robot.subsystems;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
 import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
 import edu.wpi.first.wpilibj.DigitalInput;
-<<<<<<< HEAD
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
-=======
->>>>>>> b20ba544a81d82752f6f8e390de38cbcfdc79f08
 import frc.robot.Constants;
 
 public class Gratte extends SubsystemBase {

src/main/java/frc/robot/subsystems/Limelight.java

@@ -4,15 +4,12 @@
 
 package frc.robot.subsystems;
 
-<<<<<<< HEAD
 import edu.wpi.first.cameraserver.CameraServer;
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
-=======
 import org.photonvision.PhotonCamera;
 import org.photonvision.common.hardware.VisionLEDMode;
 
 import edu.wpi.first.net.PortForwarder;
->>>>>>> b20ba544a81d82752f6f8e390de38cbcfdc79f08
 import edu.wpi.first.wpilibj2.command.SubsystemBase;