Merge branch 'main' of https://demerso.net/pls5618/2023/robot

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

@@ -80,4 +80,6 @@ public void BrakeFerme(){
   public void periodic() {
   
   }
+public void drive(double d, double leftX) {
+}
 }

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

@@ -13,7 +13,10 @@ import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
 import frc.robot.Constants;
 
 public class Gratte extends SubsystemBase {
+<<<<<<< HEAD
 
+=======
+>>>>>>> aabe9b40ae896a36acdc9cd17a508016a3660a0a
 ShuffleboardTab teb = Shuffleboard.getTab("teb"); 
 ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb")
 .getLayout("limitswitchsgratte", BuiltInLayouts.kList)

src/main/java/frc/robot/subsystems/bras/Pivot.java

@@ -14,7 +14,10 @@ import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;
 
 public class Pivot extends SubsystemBase {
+<<<<<<< HEAD
 
+=======
+>>>>>>> aabe9b40ae896a36acdc9cd17a508016a3660a0a
  ShuffleboardTab teb = Shuffleboard.getTab("teb");
   
   // moteur