3t3t3r3ryrurfvufjresudjhgbdgfhfgd5e

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

@@ -8,10 +8,13 @@ package frc.robot.subsystems.bras;
 import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;
 
+<<<<<<< HEAD
 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;
+=======
+>>>>>>> Dash
 import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
 import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout;
@@ -20,10 +23,18 @@ 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)
   .withSize(2, 2);
+=======
+  
+ShuffleboardTab teb = Shuffleboard.getTab("teb"); 
+ShuffleboardLayout bras = Shuffleboard.getTab("teb")
+.getLayout("bras", BuiltInLayouts.kList)
+.withSize(2, 2);
+>>>>>>> Dash
   /** Creates a new BrasTelescopique. */
   public BrasTelescopique() {}
   final CANSparkMax Winch = new CANSparkMax(Constants.BrasTelescopique,MotorType.kBrushless);
@@ -49,7 +60,11 @@ public class BrasTelescopique extends SubsystemBase {
     }
   @Override
   public void periodic() {
+<<<<<<< HEAD
     teb .add("photocell",0.1);
     teb .add("winch",0.1);
+=======
+    bras.add ("encodeur",0.1);
+>>>>>>> Dash
   }
 }

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

@@ -14,7 +14,11 @@ 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"); 
+>>>>>>> Dash
   // moteur
   private CANSparkMax pivot = new CANSparkMax(Constants.pivot,MotorType.kBrushless);
   private DigitalInput limitpivot = new DigitalInput(Constants.limitpivot);
@@ -23,7 +27,7 @@ public class Pivot extends SubsystemBase {
   public void monteDescendre(double vitesse) {
     pivot.set (vitesse);
   } 
-  // encoder
+  // encodeur
   public double distance(){
     return (pivot.getEncoder().getPosition());
   }
@@ -36,6 +40,12 @@ public class Pivot extends SubsystemBase {
   }
   @Override
   public void periodic() {
+<<<<<<< HEAD
     teb .add("encodeur", 0.1);
   }
-}
+}
+=======
+  teb .add ("encodeur pivot",0.1);
+ }
+}
+>>>>>>> Dash