This commit is contained in:
2023-02-20 19:58:35 -05:00
5 changed files with 27 additions and 4 deletions

View File

@ -8,7 +8,10 @@ package frc.robot.subsystems.bras;
import com.revrobotics.CANSparkMax;
import com.revrobotics.CANSparkMaxLowLevel.MotorType;
<<<<<<< HEAD
import edu.wpi.first.wpilibj.DigitalInput;
=======
>>>>>>> Dash
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.Constants;
@ -32,6 +35,10 @@ public class BrasTelescopique extends SubsystemBase {
}
@Override
public void periodic() {
<<<<<<< HEAD
Shuffleboard.getTab("SmartDashBoard") .add("photocell",0.1);
=======
Shuffleboard.getTab("SmartDashBoard") .add("winch",0.1);
>>>>>>> Dash
}
}

View File

@ -15,8 +15,8 @@ public class Pince extends SubsystemBase {
/** Creates a new Pince. */
public Pince() {
}
public void fermer() {
pistonPince.set(Value.kReverse);
public void fermer() {
pistonPince.set(Value.kReverse);
}
public void ouvrir() {
pistonPince.set(Value.kForward);

View File

@ -4,7 +4,10 @@
package frc.robot.subsystems.bras;
<<<<<<< HEAD
import edu.wpi.first.wpilibj.DigitalInput;
=======
>>>>>>> Dash
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.Constants;
@ -34,6 +37,11 @@ public class Pivot extends SubsystemBase {
}
@Override
public void periodic() {
<<<<<<< HEAD
Shuffleboard.getTab("SmartDashBoard") .add("limitpivot",0.1);
}
=======
Shuffleboard.getTab("SmartDashBoard") .add("pivot encodeur",0.1);
}
>>>>>>> Dash
}