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

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

@@ -18,7 +18,9 @@ public class GratteBaisser extends CommandBase {
 
   // Called when the command is initially scheduled.
   @Override
-  public void initialize() {}
+  public void initialize() {
+  gratte.setenHaut(false);
+  }
 
   // Called every time the scheduler runs while the command is scheduled.
   @Override

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

@@ -19,7 +19,9 @@ public class GratteMonte extends CommandBase {
 
   // Called when the command is initially scheduled.
   @Override
-  public void initialize() {}
+  public void initialize() {
+    gratte.setenHaut(true);
+  }
 
   // Called every time the scheduler runs while the command is scheduled.
   @Override

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

@@ -4,13 +4,18 @@
 
 package frc.robot.commands;
 
+import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
+import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
 import edu.wpi.first.wpilibj2.command.CommandBase;
 import frc.robot.subsystems.BasePilotable;
 
 public class Gyro extends CommandBase {
+  ShuffleboardTab teb = Shuffleboard.getTab("teb");
   private BasePilotable basePilotable;
   /** Creates a new Gyro. */
   public Gyro(BasePilotable basePilotable) {
+    teb.add("angleGyro", 0.1);
+    teb.add("vitesseGyro", 0.1);
     this.basePilotable = basePilotable;
     // Use addRequirements() here to declare subsystem dependencies.
     addRequirements(basePilotable);
@@ -25,11 +30,19 @@ public class Gyro extends CommandBase {
   public void execute() {
   if(basePilotable.getpitch()>4) 
    { 
+<<<<<<< HEAD
     basePilotable.drive(0.3*basePilotable.getpitch()/12, 0);
    }
    else if(basePilotable.getpitch()<-4) 
    { 
     basePilotable.drive(0.3*basePilotable.getpitch()/12, 0);
+=======
+    basePilotable.drive(0.3*basePilotable.getpitch()/15, 0);
+   }
+   else if(basePilotable.getpitch()<-4) 
+   { 
+    basePilotable.drive(0.3*basePilotable.getpitch()/15, 0);
+>>>>>>> 3d2364b54822fb53a6cd71a0347d11baeef62001
    }
    else
    {