From 50cf278f0002d65bcf4ff75582af86d0c1365851 Mon Sep 17 00:00:00 2001 From: EdwardFaucher Date: Wed, 8 Mar 2023 19:50:49 -0500 Subject: [PATCH] fnc n --- src/main/java/frc/robot/subsystems/Gratte.java | 5 +---- .../frc/robot/subsystems/bras/BrasTelescopique.java | 6 ++---- src/main/java/frc/robot/subsystems/bras/Pivot.java | 10 ++-------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java index acf7ede..8b0a9a2 100644 --- a/src/main/java/frc/robot/subsystems/Gratte.java +++ b/src/main/java/frc/robot/subsystems/Gratte.java @@ -13,11 +13,8 @@ import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab; import frc.robot.Constants; public class Gratte extends SubsystemBase { -<<<<<<< HEAD - ShuffleboardTab teb = Shuffleboard.getTab("teb"); -======= + ShuffleboardTab teb = Shuffleboard.getTab("teb"); ->>>>>>> fc4607f3c6d7203a155182eded4626d37f75de5e ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb") .getLayout("limitswitchsgratte", BuiltInLayouts.kList) .withSize(2, 2); diff --git a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java index 1ffdf3d..0e627cb 100644 --- a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java +++ b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java @@ -12,14 +12,14 @@ 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) .withSize(2, 2); @@ -27,9 +27,7 @@ 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() { teb .add("photocell",0.1); diff --git a/src/main/java/frc/robot/subsystems/bras/Pivot.java b/src/main/java/frc/robot/subsystems/bras/Pivot.java index 0db4639..082ce2b 100644 --- a/src/main/java/frc/robot/subsystems/bras/Pivot.java +++ b/src/main/java/frc/robot/subsystems/bras/Pivot.java @@ -14,12 +14,9 @@ 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); @@ -46,7 +43,6 @@ public class Pivot extends SubsystemBase { @Override public void periodic() { } -<<<<<<< HEAD @@ -55,7 +51,5 @@ public class Pivot extends SubsystemBase { teb.add ("encodeur pivot",0.1); } } -======= -} ->>>>>>> fc4607f3c6d7203a155182eded4626d37f75de5e +