From 306e70101f13346b215304cd647cb54a4528b729 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Wed, 22 Feb 2023 18:53:57 -0500 Subject: [PATCH] hiuuujujujuuuuu --- .../frc/robot/subsystems/bras/BrasTelescopique.java | 10 ++-------- src/main/java/frc/robot/subsystems/bras/Pivot.java | 10 +--------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java index 47ca244..94ed0f7 100644 --- a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java +++ b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java @@ -9,12 +9,9 @@ import com.revrobotics.CANSparkMax; import com.revrobotics.CANSparkMaxLowLevel.MotorType; import edu.wpi.first.wpilibj.DigitalInput; -<<<<<<< HEAD -======= import edu.wpi.first.wpilibj.DoubleSolenoid; import edu.wpi.first.wpilibj.PneumaticsModuleType; import edu.wpi.first.wpilibj.DoubleSolenoid.Value; ->>>>>>> 2c79346ce98c80f71d749f5cfbe0025b5dedf77a import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab; import edu.wpi.first.wpilibj2.command.SubsystemBase; @@ -47,12 +44,9 @@ public class BrasTelescopique extends SubsystemBase { } @Override public void periodic() { -<<<<<<< HEAD teb .add("``photocell``",0.1); teb .add("winch",0.1); -======= - Shuffleboard.getTab("SmartDashBoard") .add("photocell",0.1); - Shuffleboard.getTab("SmartDashBoard") .add("winch",0.1); ->>>>>>> 2c79346ce98c80f71d749f5cfbe0025b5dedf77a } + + } diff --git a/src/main/java/frc/robot/subsystems/bras/Pivot.java b/src/main/java/frc/robot/subsystems/bras/Pivot.java index 447e9cb..42f5ef3 100644 --- a/src/main/java/frc/robot/subsystems/bras/Pivot.java +++ b/src/main/java/frc/robot/subsystems/bras/Pivot.java @@ -36,14 +36,6 @@ public class Pivot extends SubsystemBase { } @Override public void periodic() { -<<<<<<< HEAD teb .add("encodeur", 0.1); } -} -======= - Shuffleboard.getTab("SmartDashBoard") .add("limitpivot",0.1); - Shuffleboard.getTab("SmartDashBoard") .add("pivot encodeur",0.1); - } - } - ->>>>>>> 2c79346ce98c80f71d749f5cfbe0025b5dedf77a +} \ No newline at end of file