Compare commits

..

No commits in common. "5f8c2223518b201f3dd87a5de2be660930d9ddb7" and "1e5b837267f611a4f18c90ac8e26c03a5d98d179" have entirely different histories.

View File

@ -5,20 +5,15 @@
package frc.robot.commands.grimpeur; package frc.robot.commands.grimpeur;
import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Command;
import frc.robot.subsystems.Bougie;
import frc.robot.subsystems.Grimpeur; import frc.robot.subsystems.Grimpeur;
/* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
public class GrimpeurManuelhaut extends Command { public class GrimpeurManuelhaut extends Command {
private Grimpeur grimpeur; private Grimpeur grimpeur;
private Bougie bougie;
/** Creates a new GrimpeurManuel. */ /** Creates a new GrimpeurManuel. */
public GrimpeurManuelhaut(Grimpeur grimpeur,Bougie bougie) { public GrimpeurManuelhaut(Grimpeur grimpeur) {
this.grimpeur = grimpeur; this.grimpeur = grimpeur;
addRequirements(grimpeur);
this.bougie = bougie;
addRequirements(grimpeur, bougie);
// Use addRequirements() here to declare subsystem dependencies. // Use addRequirements() here to declare subsystem dependencies.
} }
@ -30,13 +25,11 @@ public class GrimpeurManuelhaut extends Command {
@Override @Override
public void execute() { public void execute() {
if(grimpeur.stop()){ if(grimpeur.stop()){
bougie.RainBow(); grimpeur.grimpe(0);
grimpeur.grimpe(-0.5);
} }
else{ else{
bougie.RainBowStop(); grimpeur.grimpe(0.2);
grimpeur.grimpe(-0.5);
} }
} }
@ -45,10 +38,6 @@ public class GrimpeurManuelhaut extends Command {
@Override @Override
public void end(boolean interrupted) { public void end(boolean interrupted) {
grimpeur.grimpe(0); grimpeur.grimpe(0);
if(grimpeur.stop()){
bougie.RainBow();
}
else{bougie.RainBowStop();}
} }
// Returns true when the command should end. // Returns true when the command should end.