From 2455414992009b0ec3a6b446f5a3c3e76c06896d Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 21 Nov 2022 18:10:37 -0500 Subject: [PATCH 1/7] a --- src/main/java/frc/robot/commands/Activer_poussoir.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/frc/robot/commands/Activer_poussoir.java b/src/main/java/frc/robot/commands/Activer_poussoir.java index 0506948..7da9666 100644 --- a/src/main/java/frc/robot/commands/Activer_poussoir.java +++ b/src/main/java/frc/robot/commands/Activer_poussoir.java @@ -20,12 +20,16 @@ public class Activer_poussoir extends CommandBase { // Called when the command is initially scheduled. @Override public void initialize() { + poussoir.pousser(); } // Called once the command ends or is interrupted. @Override - public void end(boolean interrupted) {} + public void end(boolean interrupted) { + + poussoir.tirer(); + } // Returns true when the command should end. @Override From 38cfc7096068c39c895109fa3e8fad14a2cc754d Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 21 Nov 2022 18:22:02 -0500 Subject: [PATCH 2/7] a --- src/main/.vscode/settings.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/main/.vscode/settings.json diff --git a/src/main/.vscode/settings.json b/src/main/.vscode/settings.json new file mode 100644 index 0000000..2b898f6 --- /dev/null +++ b/src/main/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "java.project.sourcePaths": [ + "java/frc/robot/commands" + ] +} \ No newline at end of file From 983369bea46485d6f9357e53697b190f8c73e523 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 21 Nov 2022 18:27:35 -0500 Subject: [PATCH 3/7] dvsfdgnb --- src/main/java/frc/robot/commands/Acctivershaker.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc/robot/commands/Acctivershaker.java b/src/main/java/frc/robot/commands/Acctivershaker.java index 12d2dd8..253679a 100644 --- a/src/main/java/frc/robot/commands/Acctivershaker.java +++ b/src/main/java/frc/robot/commands/Acctivershaker.java @@ -20,7 +20,7 @@ public class Acctivershaker extends CommandBase { // Called when the command is initially scheduled. @Override public void initialize() { - + pistonshaker.sortirpiston(); } // 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. @Override - public void end(boolean interrupted) {} + public void end(boolean interrupted) { + pistonshaker.rentrerpiston(); + } // Returns true when the command should end. @Override From 4d622796a506290dc22c760ae8ffb5ee31afc665 Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 21 Nov 2022 18:33:21 -0500 Subject: [PATCH 4/7] zaresxhbjnkm --- .../frc/robot/commands/ActiverBlockeur.java | 40 +++++++++++++++++++ .../robot/commands/DesactiverBlockeur.java | 32 +++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 src/main/java/frc/robot/commands/ActiverBlockeur.java create mode 100644 src/main/java/frc/robot/commands/DesactiverBlockeur.java diff --git a/src/main/java/frc/robot/commands/ActiverBlockeur.java b/src/main/java/frc/robot/commands/ActiverBlockeur.java new file mode 100644 index 0000000..c352de2 --- /dev/null +++ b/src/main/java/frc/robot/commands/ActiverBlockeur.java @@ -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; + } +} diff --git a/src/main/java/frc/robot/commands/DesactiverBlockeur.java b/src/main/java/frc/robot/commands/DesactiverBlockeur.java new file mode 100644 index 0000000..5272c73 --- /dev/null +++ b/src/main/java/frc/robot/commands/DesactiverBlockeur.java @@ -0,0 +1,32 @@ +// 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; + +public class DesactiverBlockeur extends CommandBase { + /** Creates a new DesactiverBlockeur. */ + public DesactiverBlockeur() { + // Use addRequirements() here to declare subsystem dependencies. + } + + // Called when the command is initially scheduled. + @Override + public void initialize() {} + + // 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; + } +} From 9d7a0f491ff63c97c9ab9a1e7592907ef8cb6625 Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 21 Nov 2022 18:39:10 -0500 Subject: [PATCH 5/7] zdsfgh --- .../java/frc/robot/commands/DesactiverBlockeur.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc/robot/commands/DesactiverBlockeur.java b/src/main/java/frc/robot/commands/DesactiverBlockeur.java index 5272c73..2ec7bfd 100644 --- a/src/main/java/frc/robot/commands/DesactiverBlockeur.java +++ b/src/main/java/frc/robot/commands/DesactiverBlockeur.java @@ -5,16 +5,24 @@ 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() { + 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() {} + public void initialize() { + + poussoir.debloque(); + } // Called every time the scheduler runs while the command is scheduled. @Override From fcb2226b55d61a81fc0d32302a702f4105f1114d Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 21 Nov 2022 18:39:58 -0500 Subject: [PATCH 6/7] jn --- src/main/java/frc/robot/commands/DesactiverBlockeur.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc/robot/commands/DesactiverBlockeur.java b/src/main/java/frc/robot/commands/DesactiverBlockeur.java index 2ec7bfd..42d672f 100644 --- a/src/main/java/frc/robot/commands/DesactiverBlockeur.java +++ b/src/main/java/frc/robot/commands/DesactiverBlockeur.java @@ -8,11 +8,11 @@ import edu.wpi.first.wpilibj2.command.CommandBase; import frc.robot.subsystems.Poussoir; public class DesactiverBlockeur extends CommandBase { - private Poussoir poussoir + private Poussoir poussoir; /** Creates a new DesactiverBlockeur. */ public DesactiverBlockeur(Poussoir poussoir) { this.poussoir = poussoir; - + addRequirements(poussoir); // Use addRequirements() here to declare subsystem dependencies. } From 0a70ba19a4522c89d37ca7b86a589ee34ec774bc Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 21 Nov 2022 18:45:23 -0500 Subject: [PATCH 7/7] tehrdgfjgjh --- .../commands/{Acctivershaker.java => Activershaker.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/main/java/frc/robot/commands/{Acctivershaker.java => Activershaker.java} (91%) diff --git a/src/main/java/frc/robot/commands/Acctivershaker.java b/src/main/java/frc/robot/commands/Activershaker.java similarity index 91% rename from src/main/java/frc/robot/commands/Acctivershaker.java rename to src/main/java/frc/robot/commands/Activershaker.java index 253679a..71d99fe 100644 --- a/src/main/java/frc/robot/commands/Acctivershaker.java +++ b/src/main/java/frc/robot/commands/Activershaker.java @@ -7,10 +7,10 @@ package frc.robot.commands; import edu.wpi.first.wpilibj2.command.CommandBase; import frc.robot.subsystems.Pistonshaker; -public class Acctivershaker extends CommandBase { +public class Activershaker extends CommandBase { private Pistonshaker pistonshaker; /** Creates a new Acctivershaker. */ - public Acctivershaker(Pistonshaker pistonshaker) { + public Activershaker(Pistonshaker pistonshaker) { this.pistonshaker = pistonshaker; // Use addRequirements() here to declare subsystem dependencies. addRequirements(pistonshaker);