Compare commits

..

No commits in common. "104c9195bccf23fb5527cec58962eb52da551b55" and "1989806378c864fb061206438d619bd5a44d976d" have entirely different histories.

2 changed files with 3 additions and 12 deletions

File diff suppressed because one or more lines are too long

View File

@ -30,23 +30,14 @@ public class Lanceur extends SubsystemBase {
lanceur2.setStatusFramePeriod(StatusFrameEnhanced.Status_2_Feedback0, 1); lanceur2.setStatusFramePeriod(StatusFrameEnhanced.Status_2_Feedback0, 1);
} }
public void masterslave(){
lanceur2.follow(lanceur1);
lanceur2.setInverted(true);
}
public void lance(double vitesse){ public void lance(double vitesse){
lanceur1.set(vitesse); lanceur1.set(vitesse);
lanceur2.set(-vitesse);
} }
public void tourelRotation(double vitesse){ public void tourelRotation(double vitesse){
tourelle.set(vitesse); tourelle.set(vitesse);
} }
public double distancetourel(){ public void setPID(double p, double i, int d) {
return(tourelle.getEncoder().getPosition());
}
public void PIDlanceur(double p, double i, double d) {
lanceur1.config_kP(0, p);
lanceur1.config_kI(0, i);
lanceur1.config_kD(0, d);
} }
@Override @Override
public void periodic() { public void periodic() {