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

hgd

Browse Source
This commit is contained in:
Olivier Dubois
2023-03-07 19:17:53 -05:00
parent 27d5b3cad7
commit e7f5b81445
10 changed files with 21 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);

1
src/main/java/frc/robot/subsystems/bras/Pince.java
View File

@ -8,7 +8,6 @@ import edu.wpi.first.wpilibj.DoubleSolenoid;
import edu.wpi.first.wpilibj.PneumaticsModuleType;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
import frc.robot.Constants;

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

@ -14,11 +14,8 @@ 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
ShuffleboardTab teb = Shuffleboard.getTab("teb");
// moteur
private CANSparkMax pivot = new CANSparkMax(Constants.pivot,MotorType.kBrushless);
private DigitalInput limitpivot = new DigitalInput(Constants.limitpivot);
@ -27,6 +24,10 @@ ShuffleboardTab teb = Shuffleboard.getTab("teb");
public void monteDescendre(double vitesse) {
pivot.set (vitesse);
}
public Pivot(){
teb .add ("encodeurpivot",0.1);
teb .add ("limitpivot",0.1);
}
// encodeur
public double distance(){
return (pivot.getEncoder().getPosition());
@ -40,17 +41,6 @@ ShuffleboardTab teb = Shuffleboard.getTab("teb");
}
@Override
public void periodic() {
teb .add("encodeur", 0.1);
teb .add ("encodeur pivot",0.1);
}
<<<<<<< HEAD
}
}
=======
{
teb.add ("encodeur pivot",0.1);
}
}
>>>>>>> cd7604e30f9d6c974930cf5af86554639315c8a0