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

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

@@ -12,14 +12,13 @@ import edu.wpi.first.wpilibj.DigitalInput;
 import edu.wpi.first.wpilibj.DoubleSolenoid;
 import edu.wpi.first.wpilibj.PneumaticsModuleType;
 import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
-import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
-import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout;
 import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
 import frc.robot.Constants;
 
 public class BrasTelescopique extends SubsystemBase {
+<<<<<<< HEAD
   ShuffleboardTab teb = Shuffleboard.getTab("teb");
   ShuffleboardLayout layout = Shuffleboard.getTab("teb")
   .getLayout("layout", BuiltInLayouts.kList)
@@ -28,8 +27,14 @@ public class BrasTelescopique extends SubsystemBase {
 ShuffleboardLayout bras = Shuffleboard.getTab("teb")
 .getLayout("bras", BuiltInLayouts.kList)
 .withSize(2, 2);
+=======
+  ShuffleboardTab teb = Shuffleboard.getTab("teb");  
+>>>>>>> fc4607f3c6d7203a155182eded4626d37f75de5e
   /** Creates a new BrasTelescopique. */
-  public BrasTelescopique() {}
+  public BrasTelescopique() {
+    teb .add("photocell",0.1);
+    teb .add("winch",0.1);
+    teb .add("encodeur",0.1);}
   final CANSparkMax Winch = new CANSparkMax(Constants.BrasTelescopique,MotorType.kBrushless);
   private DigitalInput photocell = new DigitalInput(Constants.photocell);
   private DoubleSolenoid brakewinch = new DoubleSolenoid(PneumaticsModuleType.CTREPCM,Constants.brakewinchf, Constants.brakewinchb);
@@ -53,8 +58,6 @@ ShuffleboardLayout bras = Shuffleboard.getTab("teb")
     }
   @Override
   public void periodic() {
-    teb .add("photocell",0.1);
-    teb .add("winch",0.1);
-    bras.add ("encodeur",0.1);
+    
   }
 }

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

@@ -8,7 +8,6 @@ import edu.wpi.first.wpilibj.DoubleSolenoid;
 import edu.wpi.first.wpilibj.PneumaticsModuleType;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
 import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
-
 import frc.robot.Constants;
 
 

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

@@ -14,7 +14,12 @@ import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;
 
 public class Pivot extends SubsystemBase {
+<<<<<<< HEAD
   ShuffleboardTab teb = Shuffleboard.getTab("teb");
+=======
+ ShuffleboardTab teb = Shuffleboard.getTab("teb");
+  
+>>>>>>> fc4607f3c6d7203a155182eded4626d37f75de5e
   // moteur
   private CANSparkMax pivot = new CANSparkMax(Constants.pivot,MotorType.kBrushless);
   private DigitalInput limitpivot = new DigitalInput(Constants.limitpivot);
@@ -23,6 +28,10 @@ public class Pivot extends SubsystemBase {
   public void monteDescendre(double vitesse) {
     pivot.set (vitesse);
   } 
+  public Pivot(){
+    teb .add ("encodeurpivot",0.1);
+    teb .add ("limitpivot",0.1);
+  }
   // encodeur
   public double distance(){
     return (pivot.getEncoder().getPosition());
@@ -36,9 +45,8 @@ public class Pivot extends SubsystemBase {
   }
   @Override
   public void periodic() {
-    teb .add("encodeur", 0.1);
-    teb .add ("encodeur pivot",0.1);
   }
+<<<<<<< HEAD
 
   
  
@@ -47,3 +55,7 @@ public class Pivot extends SubsystemBase {
   teb.add ("encodeur pivot",0.1);
  }
 }
+=======
+}  
+
+>>>>>>> fc4607f3c6d7203a155182eded4626d37f75de5e