Merge remote-tracking branch 'origin/main' into Conduire
This commit is contained in:
commit
55f7b5b834
5
src/main/.vscode/settings.json
vendored
Normal file
5
src/main/.vscode/settings.json
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"java.project.sourcePaths": [
|
||||||
|
"java/frc/robot/commands"
|
||||||
|
]
|
||||||
|
}
|
40
src/main/java/frc/robot/commands/ActiverBlockeur.java
Normal file
40
src/main/java/frc/robot/commands/ActiverBlockeur.java
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
// Copyright (c) FIRST and other WPILib contributors.
|
||||||
|
// Open Source Software; you can modify and/or share it under the terms of
|
||||||
|
// the WPILib BSD license file in the root directory of this project.
|
||||||
|
|
||||||
|
package frc.robot.commands;
|
||||||
|
|
||||||
|
import edu.wpi.first.wpilibj2.command.CommandBase;
|
||||||
|
import frc.robot.subsystems.Poussoir;
|
||||||
|
|
||||||
|
public class ActiverBlockeur extends CommandBase {
|
||||||
|
private Poussoir poussoir;
|
||||||
|
/** Creates a new ActiverBlockeur. */
|
||||||
|
public ActiverBlockeur(Poussoir poussoir) {
|
||||||
|
this.poussoir = poussoir;
|
||||||
|
|
||||||
|
addRequirements(poussoir);
|
||||||
|
// Use addRequirements() here to declare subsystem dependencies.
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called when the command is initially scheduled.
|
||||||
|
@Override
|
||||||
|
public void initialize() {
|
||||||
|
|
||||||
|
poussoir.bloquer();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called every time the scheduler runs while the command is scheduled.
|
||||||
|
@Override
|
||||||
|
public void execute() {}
|
||||||
|
|
||||||
|
// Called once the command ends or is interrupted.
|
||||||
|
@Override
|
||||||
|
public void end(boolean interrupted) {}
|
||||||
|
|
||||||
|
// Returns true when the command should end.
|
||||||
|
@Override
|
||||||
|
public boolean isFinished() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
@ -20,12 +20,16 @@ public class Activer_poussoir extends CommandBase {
|
|||||||
// Called when the command is initially scheduled.
|
// Called when the command is initially scheduled.
|
||||||
@Override
|
@Override
|
||||||
public void initialize() {
|
public void initialize() {
|
||||||
|
|
||||||
poussoir.pousser();
|
poussoir.pousser();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called once the command ends or is interrupted.
|
// Called once the command ends or is interrupted.
|
||||||
@Override
|
@Override
|
||||||
public void end(boolean interrupted) {}
|
public void end(boolean interrupted) {
|
||||||
|
|
||||||
|
poussoir.tirer();
|
||||||
|
}
|
||||||
|
|
||||||
// Returns true when the command should end.
|
// Returns true when the command should end.
|
||||||
@Override
|
@Override
|
||||||
|
@ -7,10 +7,10 @@ package frc.robot.commands;
|
|||||||
import edu.wpi.first.wpilibj2.command.CommandBase;
|
import edu.wpi.first.wpilibj2.command.CommandBase;
|
||||||
import frc.robot.subsystems.Pistonshaker;
|
import frc.robot.subsystems.Pistonshaker;
|
||||||
|
|
||||||
public class Acctivershaker extends CommandBase {
|
public class Activershaker extends CommandBase {
|
||||||
private Pistonshaker pistonshaker;
|
private Pistonshaker pistonshaker;
|
||||||
/** Creates a new Acctivershaker. */
|
/** Creates a new Acctivershaker. */
|
||||||
public Acctivershaker(Pistonshaker pistonshaker) {
|
public Activershaker(Pistonshaker pistonshaker) {
|
||||||
this.pistonshaker = pistonshaker;
|
this.pistonshaker = pistonshaker;
|
||||||
// Use addRequirements() here to declare subsystem dependencies.
|
// Use addRequirements() here to declare subsystem dependencies.
|
||||||
addRequirements(pistonshaker);
|
addRequirements(pistonshaker);
|
||||||
@ -20,7 +20,7 @@ public class Acctivershaker extends CommandBase {
|
|||||||
// Called when the command is initially scheduled.
|
// Called when the command is initially scheduled.
|
||||||
@Override
|
@Override
|
||||||
public void initialize() {
|
public void initialize() {
|
||||||
|
pistonshaker.sortirpiston();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called every time the scheduler runs while the command is scheduled.
|
// Called every time the scheduler runs while the command is scheduled.
|
||||||
@ -29,7 +29,9 @@ public class Acctivershaker extends CommandBase {
|
|||||||
|
|
||||||
// Called once the command ends or is interrupted.
|
// Called once the command ends or is interrupted.
|
||||||
@Override
|
@Override
|
||||||
public void end(boolean interrupted) {}
|
public void end(boolean interrupted) {
|
||||||
|
pistonshaker.rentrerpiston();
|
||||||
|
}
|
||||||
|
|
||||||
// Returns true when the command should end.
|
// Returns true when the command should end.
|
||||||
@Override
|
@Override
|
40
src/main/java/frc/robot/commands/DesactiverBlockeur.java
Normal file
40
src/main/java/frc/robot/commands/DesactiverBlockeur.java
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
// Copyright (c) FIRST and other WPILib contributors.
|
||||||
|
// Open Source Software; you can modify and/or share it under the terms of
|
||||||
|
// the WPILib BSD license file in the root directory of this project.
|
||||||
|
|
||||||
|
package frc.robot.commands;
|
||||||
|
|
||||||
|
import edu.wpi.first.wpilibj2.command.CommandBase;
|
||||||
|
import frc.robot.subsystems.Poussoir;
|
||||||
|
|
||||||
|
public class DesactiverBlockeur extends CommandBase {
|
||||||
|
private Poussoir poussoir;
|
||||||
|
/** Creates a new DesactiverBlockeur. */
|
||||||
|
public DesactiverBlockeur(Poussoir poussoir) {
|
||||||
|
this.poussoir = poussoir;
|
||||||
|
|
||||||
|
addRequirements(poussoir);
|
||||||
|
// Use addRequirements() here to declare subsystem dependencies.
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called when the command is initially scheduled.
|
||||||
|
@Override
|
||||||
|
public void initialize() {
|
||||||
|
|
||||||
|
poussoir.debloque();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called every time the scheduler runs while the command is scheduled.
|
||||||
|
@Override
|
||||||
|
public void execute() {}
|
||||||
|
|
||||||
|
// Called once the command ends or is interrupted.
|
||||||
|
@Override
|
||||||
|
public void end(boolean interrupted) {}
|
||||||
|
|
||||||
|
// Returns true when the command should end.
|
||||||
|
@Override
|
||||||
|
public boolean isFinished() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user