From 1d6fe9fc3c53269fd64970462316ba91023dd2b4 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Thu, 25 Jan 2024 20:06:27 -0500 Subject: [PATCH 1/4] Lancer --- src/main/java/frc/robot/command/Lancer.java | 18 ++++++++++++++++-- .../java/frc/robot/subsystem/Accumulateur.java | 12 +++++++++--- src/main/java/frc/robot/subsystem/Lanceur.java | 10 +++++----- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/main/java/frc/robot/command/Lancer.java b/src/main/java/frc/robot/command/Lancer.java index feea8c0..804f019 100644 --- a/src/main/java/frc/robot/command/Lancer.java +++ b/src/main/java/frc/robot/command/Lancer.java @@ -4,12 +4,22 @@ package frc.robot.command; +import com.revrobotics.CANSparkMax; + import edu.wpi.first.wpilibj2.command.Command; +import frc.robot.subsystem.Accumulateur; +import frc.robot.subsystem.Lanceur; public class Lancer extends Command { /** Creates a new Lanceur. */ + + private Lanceur lancer; + private Lanceur lancer2; + private Lanceur lancer3; + private Lanceur lancer4; public Lancer() { // Use addRequirements() here to declare subsystem dependencies. + addRequirements(lancer,lancer2,lancer3,lancer4); } // Called when the command is initially scheduled. @@ -18,11 +28,15 @@ public class Lancer extends Command { // Called every time the scheduler runs while the command is scheduled. @Override - public void execute() {} + public void execute() { + lancer.lancer(0.3); + } // Called once the command ends or is interrupted. @Override - public void end(boolean interrupted) {} + public void end(boolean interrupted) { + lancer.lancer(0); + } // Returns true when the command should end. @Override diff --git a/src/main/java/frc/robot/subsystem/Accumulateur.java b/src/main/java/frc/robot/subsystem/Accumulateur.java index 9c51357..2ae3c97 100644 --- a/src/main/java/frc/robot/subsystem/Accumulateur.java +++ b/src/main/java/frc/robot/subsystem/Accumulateur.java @@ -9,14 +9,18 @@ import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; import edu.wpi.first.wpilibj.DigitalInput; import edu.wpi.first.wpilibj2.command.SubsystemBase; import frc.robot.Constants; +import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab; +import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts; +import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout; public class Accumulateur extends SubsystemBase { /** Creates a new Accumulateur. */ - + ShuffleboardTab dashboard = Shuffleboard.getTab("dashboard"); final WPI_TalonSRX Moteuracc2 = new WPI_TalonSRX(Constants.Moteuracc2); final WPI_TalonSRX Moteuracc = new WPI_TalonSRX(Constants.Moteuracc); - final DigitalInput limitacc = new DigitalInput(Constants.limitacc); + final DigitalInput limitacc = new DigitalInput(Constants.limitacc); + public void Deaccumuler(double vitesse){ Moteuracc2.set(vitesse); } @@ -27,7 +31,9 @@ public class Accumulateur extends SubsystemBase { public boolean limitswitch(){ return limitacc.get(); } - public Accumulateur() {} + public Accumulateur() { + dashboard.addBoolean("limitacc", this::limitswitch); + } public void Accumuler(double vitesse){ Moteuracc.set(vitesse); Moteuracc2.set(vitesse); diff --git a/src/main/java/frc/robot/subsystem/Lanceur.java b/src/main/java/frc/robot/subsystem/Lanceur.java index 260f263..7ae2c2c 100644 --- a/src/main/java/frc/robot/subsystem/Lanceur.java +++ b/src/main/java/frc/robot/subsystem/Lanceur.java @@ -18,13 +18,13 @@ public class Lanceur extends SubsystemBase { public Lanceur() {} final CANSparkMax lancer = new CANSparkMax(Constants.lanceur, MotorType.kBrushless); final CANSparkMax lancer2 = new CANSparkMax(Constants.lancer2, MotorType.kBrushless); - final CANSparkMax lancer3 = new CANSparkMax(Constants.lanceur, MotorType.kBrushless); - final CANSparkMax lancer4 = new CANSparkMax(Constants.lancer2, MotorType.kBrushless); + final CANSparkMax lancer3 = new CANSparkMax(Constants.lancer3, MotorType.kBrushless); + final CANSparkMax lancer4 = new CANSparkMax(Constants.lancer4, MotorType.kBrushless); - public void lancer(double vitesse){ - lancer.set(vitesse); + public void lancer(double vitesse){ + lancer.set(vitesse); } - public void lanceur(){ + public void lanceur(){ lancer2.follow(lancer); lancer3.follow(lancer); lancer4.follow(lancer); From 8c7dc5ab8763ef39c85f885aa416d9f1b96ed031 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 29 Jan 2024 19:13:09 -0500 Subject: [PATCH 2/4] grimpeur --- .../java/frc/robot/command/GrimpeurHaut.java | 35 +++++++++++++++++-- .../java/frc/robot/subsystem/Grimpeur.java | 7 +++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/main/java/frc/robot/command/GrimpeurHaut.java b/src/main/java/frc/robot/command/GrimpeurHaut.java index 840c475..a14a6fb 100644 --- a/src/main/java/frc/robot/command/GrimpeurHaut.java +++ b/src/main/java/frc/robot/command/GrimpeurHaut.java @@ -18,17 +18,46 @@ public class GrimpeurHaut extends Command { // Called when the command is initially scheduled. @Override - public void initialize() {} + public void initialize() { + grimpeur.resetencodeurd(); + grimpeur.resetencodeurg(); + } // Called every time the scheduler runs while the command is scheduled. @Override public void execute() { - + if(grimpeur.droite()){ + grimpeur.resetencodeurd(); + } + else if(grimpeur.gauche()){ + grimpeur.resetencodeurg(); + } + else if(grimpeur.encoderd()>261){ + grimpeur.droit(0); + } + else if(grimpeur.getpitch()<-15){ + grimpeur.droit(0.6); + grimpeur.gauche(-0.6); + } + else if(grimpeur.getpitch()>15){ + grimpeur.gauche(0.6); + grimpeur.droit(-0.6); + } + else if(grimpeur.encoderg()>261){ + grimpeur.gauche(0.6); + } + else{ + grimpeur.gauche(0); + grimpeur.gauche(0); + } } // Called once the command ends or is interrupted. @Override - public void end(boolean interrupted) {} + public void end(boolean interrupted) { + grimpeur.droit(0); + grimpeur.gauche(0); + } // Returns true when the command should end. @Override diff --git a/src/main/java/frc/robot/subsystem/Grimpeur.java b/src/main/java/frc/robot/subsystem/Grimpeur.java index ed02bda..4f595c4 100644 --- a/src/main/java/frc/robot/subsystem/Grimpeur.java +++ b/src/main/java/frc/robot/subsystem/Grimpeur.java @@ -45,7 +45,12 @@ public void resetencodeurd(){ public void resetencodeurg(){ grimpeurg.getEncoder().setPosition(0); } - +public double encoderd(){ + return grimpeurd.getEncoder().getPosition(); +} +public double encoderg(){ + return grimpeurg.getEncoder().getPosition(); +} public AHRS gyroscope = new AHRS(); public double getpitch(){ return gyroscope.getPitch(); From 88e4a0b885cc5732f0e773e2dcc106141f4a3677 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 29 Jan 2024 19:28:59 -0500 Subject: [PATCH 3/4] grimpeur --- .../java/frc/robot/command/GrimpeurBas.java | 51 +++++++++++++++++++ .../java/frc/robot/command/GrimpeurHaut.java | 25 +++++---- 2 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 src/main/java/frc/robot/command/GrimpeurBas.java diff --git a/src/main/java/frc/robot/command/GrimpeurBas.java b/src/main/java/frc/robot/command/GrimpeurBas.java new file mode 100644 index 0000000..47b2a53 --- /dev/null +++ b/src/main/java/frc/robot/command/GrimpeurBas.java @@ -0,0 +1,51 @@ +// 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.command; + +import edu.wpi.first.wpilibj2.command.Command; +import frc.robot.subsystem.Grimpeur; + +public class GrimpeurBas extends Command { + private Grimpeur grimpeur; + /** Creates a new GrimpeurBas. */ + public GrimpeurBas(Grimpeur grimpeur) { + this.grimpeur = grimpeur; + addRequirements(grimpeur); + // Use addRequirements() here to declare subsystem dependencies. + } + + // Called when the command is initially scheduled. + @Override + public void initialize() { + grimpeur.resetencodeurd(); + grimpeur.resetencodeurg(); + } + + // Called every time the scheduler runs while the command is scheduled. + @Override + public void execute() { + if(grimpeur.droite()){ + grimpeur.resetencodeurd(); + grimpeur.gauche(0); + } + if(grimpeur.gauche()){ + grimpeur.resetencodeurg(); + grimpeur.gauche(0); + } + } + + // Called once the command ends or is interrupted. + @Override + public void end(boolean interrupted) { + grimpeur.droit(0); + grimpeur.gauche(0); + } + + // Returns true when the command should end. + @Override + public boolean isFinished() { + return false; + } +} diff --git a/src/main/java/frc/robot/command/GrimpeurHaut.java b/src/main/java/frc/robot/command/GrimpeurHaut.java index a14a6fb..2fbe288 100644 --- a/src/main/java/frc/robot/command/GrimpeurHaut.java +++ b/src/main/java/frc/robot/command/GrimpeurHaut.java @@ -26,29 +26,32 @@ public class GrimpeurHaut extends Command { // Called every time the scheduler runs while the command is scheduled. @Override public void execute() { - if(grimpeur.droite()){ - grimpeur.resetencodeurd(); - } - else if(grimpeur.gauche()){ - grimpeur.resetencodeurg(); - } - else if(grimpeur.encoderd()>261){ + + if(grimpeur.encoderd()>261 ){ grimpeur.droit(0); } else if(grimpeur.getpitch()<-15){ grimpeur.droit(0.6); - grimpeur.gauche(-0.6); + } else if(grimpeur.getpitch()>15){ - grimpeur.gauche(0.6); grimpeur.droit(-0.6); } - else if(grimpeur.encoderg()>261){ + else{ + grimpeur.droit(0); + } + if(grimpeur.encoderg()>261 ){ + grimpeur.gauche(0); + } + else if(grimpeur.getpitch()<-15){ grimpeur.gauche(0.6); + + } + else if(grimpeur.getpitch()>15){ + grimpeur.gauche(-0.6); } else{ grimpeur.gauche(0); - grimpeur.gauche(0); } } From 074e91a4dc8b93af650663f433929ef41ec8cdbc Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 29 Jan 2024 19:36:18 -0500 Subject: [PATCH 4/4] grimpeur --- ...impeurHaut.java => GrimpeurHautDroit.java} | 22 ++------ .../frc/robot/command/GrimpeurHautGauche.java | 55 +++++++++++++++++++ 2 files changed, 59 insertions(+), 18 deletions(-) rename src/main/java/frc/robot/command/{GrimpeurHaut.java => GrimpeurHautDroit.java} (78%) create mode 100644 src/main/java/frc/robot/command/GrimpeurHautGauche.java diff --git a/src/main/java/frc/robot/command/GrimpeurHaut.java b/src/main/java/frc/robot/command/GrimpeurHautDroit.java similarity index 78% rename from src/main/java/frc/robot/command/GrimpeurHaut.java rename to src/main/java/frc/robot/command/GrimpeurHautDroit.java index 2fbe288..324501f 100644 --- a/src/main/java/frc/robot/command/GrimpeurHaut.java +++ b/src/main/java/frc/robot/command/GrimpeurHautDroit.java @@ -7,10 +7,10 @@ package frc.robot.command; import edu.wpi.first.wpilibj2.command.Command; import frc.robot.subsystem.Grimpeur; -public class GrimpeurHaut extends Command { +public class GrimpeurHautDroit extends Command { private Grimpeur grimpeur; /** Creates a new GrimpeurHaut. */ - public GrimpeurHaut(Grimpeur grimpeur) { + public GrimpeurHautDroit(Grimpeur grimpeur) { this.grimpeur = grimpeur; addRequirements(grimpeur); // Use addRequirements() here to declare subsystem dependencies. @@ -31,35 +31,21 @@ public class GrimpeurHaut extends Command { grimpeur.droit(0); } else if(grimpeur.getpitch()<-15){ - grimpeur.droit(0.6); + grimpeur.droit(-0.6); } else if(grimpeur.getpitch()>15){ - grimpeur.droit(-0.6); + grimpeur.droit(0.6); } else{ grimpeur.droit(0); } - if(grimpeur.encoderg()>261 ){ - grimpeur.gauche(0); - } - else if(grimpeur.getpitch()<-15){ - grimpeur.gauche(0.6); - - } - else if(grimpeur.getpitch()>15){ - grimpeur.gauche(-0.6); - } - else{ - grimpeur.gauche(0); - } } // Called once the command ends or is interrupted. @Override public void end(boolean interrupted) { grimpeur.droit(0); - grimpeur.gauche(0); } // Returns true when the command should end. diff --git a/src/main/java/frc/robot/command/GrimpeurHautGauche.java b/src/main/java/frc/robot/command/GrimpeurHautGauche.java new file mode 100644 index 0000000..2bd6593 --- /dev/null +++ b/src/main/java/frc/robot/command/GrimpeurHautGauche.java @@ -0,0 +1,55 @@ +// 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.command; + +import edu.wpi.first.wpilibj2.command.Command; +import frc.robot.subsystem.Grimpeur; + +public class GrimpeurHautGauche extends Command { + private Grimpeur grimpeur; + /** Creates a new GrimpeurHautGauche. */ + public GrimpeurHautGauche(Grimpeur grimpeur) { + this.grimpeur = grimpeur; + addRequirements(grimpeur); + // Use addRequirements() here to declare subsystem dependencies. + } + + // Called when the command is initially scheduled. + @Override + public void initialize() { + grimpeur.resetencodeurd(); + grimpeur.resetencodeurg(); + } + + // Called every time the scheduler runs while the command is scheduled. + @Override + public void execute() { + if(grimpeur.encoderg()>261 ){ + grimpeur.gauche(0); + } + else if(grimpeur.getpitch()<-15){ + grimpeur.gauche(0.6); + + } + else if(grimpeur.getpitch()>15){ + grimpeur.gauche(-0.6); + } + else{ + grimpeur.gauche(0); + } + } + + // Called once the command ends or is interrupted. + @Override + public void end(boolean interrupted) { + grimpeur.gauche(0); + } + + // Returns true when the command should end. + @Override + public boolean isFinished() { + return false; + } +}