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

rstdfghjbknl;

Browse Source
This commit is contained in:
Antoine PerreaultE
2023-03-07 18:01:56 -05:00
parent 07ce25107a
commit af2f0bb61b
4 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,13 +8,10 @@ package frc.robot.subsystems.bras;
import com.revrobotics.CANSparkMax;
import com.revrobotics.CANSparkMaxLowLevel.MotorType;
<<<<<<< HEAD
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;
=======
>>>>>>> Dash
import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout;
@ -23,18 +20,14 @@ 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);
=======
ShuffleboardTab teb = Shuffleboard.getTab("teb");
ShuffleboardLayout bras = Shuffleboard.getTab("teb")
.getLayout("bras", BuiltInLayouts.kList)
.withSize(2, 2);
>>>>>>> Dash
/** Creates a new BrasTelescopique. */
public BrasTelescopique() {}
final CANSparkMax Winch = new CANSparkMax(Constants.BrasTelescopique,MotorType.kBrushless);
@ -60,11 +53,8 @@ ShuffleboardLayout bras = Shuffleboard.getTab("teb")
}
@Override
public void periodic() {
<<<<<<< HEAD
teb .add("photocell",0.1);
teb .add("winch",0.1);
=======
bras.add ("encodeur",0.1);
>>>>>>> Dash
}
}

11
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");
>>>>>>> Dash
// moteur
private CANSparkMax pivot = new CANSparkMax(Constants.pivot,MotorType.kBrushless);
private DigitalInput limitpivot = new DigitalInput(Constants.limitpivot);
@ -40,12 +36,9 @@ ShuffleboardTab teb = Shuffleboard.getTab("teb");
}
@Override
public void periodic() {
<<<<<<< HEAD
teb .add("encodeur", 0.1);
}
}
=======
teb .add ("encodeur pivot",0.1);
{
teb.add ("encodeur pivot",0.1);
}
}
>>>>>>> Dash