From cea457445cc5bdbc04e400672d85c43ce2d67800 Mon Sep 17 00:00:00 2001
From: OlivierDubois <odubois02@csbf.qc.ca>
Date: Wed, 8 Mar 2023 18:13:47 -0500
Subject: [PATCH] kjgu][f

---
 .../frc/robot/subsystems/BasePilotable.class  | Bin 5139 -> 4598 bytes
 .../frc/robot/subsystems/BasePilotable.java   |   7 +------
 .../subsystems/bras/BrasTelescopique.java     |  13 ++-----------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/bin/main/frc/robot/subsystems/BasePilotable.class b/bin/main/frc/robot/subsystems/BasePilotable.class
index 30a8c07ebc00cf5bf07e74c7c45acc8d79238caf..3d8632d713bee88e3047c13241dd62670346323e 100644
GIT binary patch
literal 4598
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
Q$9epN?HhOt|3c^g0TkQP`v3p{

literal 5139
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

diff --git a/src/main/java/frc/robot/subsystems/BasePilotable.java b/src/main/java/frc/robot/subsystems/BasePilotable.java
index fb14cae..d8ce05a 100644
--- a/src/main/java/frc/robot/subsystems/BasePilotable.java
+++ b/src/main/java/frc/robot/subsystems/BasePilotable.java
@@ -12,9 +12,7 @@ import edu.wpi.first.wpilibj.PneumaticsModuleType;
 import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
 import edu.wpi.first.wpilibj.drive.DifferentialDrive;
 import edu.wpi.first.wpilibj.motorcontrol.MotorControllerGroup;
-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;
@@ -33,9 +31,6 @@ public class BasePilotable extends SubsystemBase {
   private DoubleSolenoid brakegauche = new DoubleSolenoid(PneumaticsModuleType.CTREPCM,Constants.brakegauche, Constants.brakegauche);
   //gyro
   ShuffleboardTab teb = Shuffleboard.getTab("teb");
-  ShuffleboardLayout layout = Shuffleboard.getTab("teb")
-  .getLayout ("distance", BuiltInLayouts.kList)
-  .withSize(2, 2);
   private AHRS gyroscope = new AHRS();public double getangle() {return gyroscope.getAngle();}
    public double getpitch() {
     return gyroscope.getPitch();
@@ -70,7 +65,7 @@ public void resetGyro(){
   /** Creates a new BasePilotable. */
   public BasePilotable() {
     droit.setInverted(true);
-    layout .addDouble("distance", this::distance);
+    teb .addDouble("distance", this::distance);
   }
 
   @Override
diff --git a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
index e10ed52..f553764 100644
--- a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
+++ b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
@@ -12,27 +12,18 @@ 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 {
-  ShuffleboardTab teb = Shuffleboard.getTab("teb");
-  ShuffleboardLayout layout = Shuffleboard.getTab("teb")
-  .getLayout("layout", BuiltInLayouts.kList)
-  .withSize(2, 2);
- ShuffleboardLayout bras = Shuffleboard.getTab("teb")
- .getLayout("bras", BuiltInLayouts.kList)
- .withSize(2, 2);
-  
+  ShuffleboardTab teb = Shuffleboard.getTab("teb");  
   /** Creates a new BrasTelescopique. */
   public BrasTelescopique() {
     teb .add("photocell",0.1);
     teb .add("winch",0.1);
-    bras.add ("encodeur",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);