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

src/main/java/frc/robot/Constants.java

@@ -4,6 +4,8 @@
 
 package frc.robot;
 
+
+
 /**
  * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean
  * constants. This class should not be used for any other purpose. All constants should be declared
@@ -12,9 +14,16 @@ package frc.robot;
  * <p>It is advised to statically import this class (or one of its inner classes) wherever the
  * constants are needed, to reduce verbosity.
  */
+<<<<<<< HEAD
 public final class Constants {}
 
 private static final int MoteurAvantGauche = (0);
 private static final int MoteurAvantDroit = (0);
 private static final int MoteurArriereDroit = (0);
-private static final int MoteurArriereDroit = (0);
+private static final int MoteurArriereDroit = (0);
+=======
+public final class Constants {
+    public static final int pistonQuiShakef = 0;
+    public static final int pistonQuiShakeb = 1;
+}
+>>>>>>> 8da918a7d2ab52ff5442835f9f446fc07fe2d1bd

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

@@ -20,7 +20,7 @@ private WPI_TalonSRX arriereGauche = new WPI_TalonSRX(Constants.MoteurArriereGau
 
 private WPI_TalonSRX arriereDroit = new WPI_TalonSRX(Constants.MoteurArriereDroit);
 
-private MecanumDrive mecanum = new MecanumDrive(avntGauche, arriereGauche, avantDroit, arriereDroit);
+private MecanumDrive mecanum = new MecanumDrive(avantGauche, arriereGauche, avantDroit, arriereDroit);
 
 private void Drive(double y, double x, double rot){
   drive.driveCarthesian(y, x, rot, 0)