PLS5618/robot-2023
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tehgfhcg

Browse Source
This commit is contained in:
samuel desharnais
2023-03-08 19:42:24 -05:00
parent 4a648fff25
commit 8a9a331e66
6 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/frc/robot/subsystems/Gratte.java
View File

@ -14,11 +14,7 @@ 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");
>>>>>>> cd7604e30f9d6c974930cf5af86554639315c8a0
ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb")
.getLayout("limitswitchsgratte", BuiltInLayouts.kList)
.withSize(2, 2);

6
src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
View File

@ -24,16 +24,10 @@ public class BrasTelescopique extends SubsystemBase {
ShuffleboardLayout layout = Shuffleboard.getTab("teb")
.getLayout("layout", BuiltInLayouts.kList)
.withSize(2, 2);
<<<<<<< HEAD
ShuffleboardLayout bras = Shuffleboard.getTab("teb")
.getLayout("bras", BuiltInLayouts.kList)
.withSize(2, 2);
=======
ShuffleboardLayout bras = Shuffleboard.getTab("teb")
.getLayout("bras", BuiltInLayouts.kList)
.withSize(2, 2);
>>>>>>> cd7604e30f9d6c974930cf5af86554639315c8a0
/** Creates a new BrasTelescopique. */
public BrasTelescopique() {}
final CANSparkMax Winch = new CANSparkMax(Constants.BrasTelescopique,MotorType.kBrushless);

9
src/main/java/frc/robot/subsystems/bras/Pivot.java
View File

@ -14,11 +14,7 @@ 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");
>>>>>>> cd7604e30f9d6c974930cf5af86554639315c8a0
// moteur
private CANSparkMax pivot = new CANSparkMax(Constants.pivot,MotorType.kBrushless);
private DigitalInput limitpivot = new DigitalInput(Constants.limitpivot);
@ -43,14 +39,11 @@ ShuffleboardTab teb = Shuffleboard.getTab("teb");
teb .add("encodeur", 0.1);
teb .add ("encodeur pivot",0.1);
}
<<<<<<< HEAD
}
=======
{
teb.add ("encodeur pivot",0.1);
}
}
>>>>>>> cd7604e30f9d6c974930cf5af86554639315c8a0