29 Commits

Author SHA1 Message Date
105447c4ad Merge branch 'requin' of https://git.demerso.net/PLS5618/Reefscape-2025 2025-02-27 18:37:29 -05:00
abb6d113d0 ajout exspire 2025-02-26 18:39:59 -05:00
df31291697 limit avec requin manuel 2025-02-26 17:05:46 -05:00
3b372104e4 requin manuel + aspire 2025-02-25 20:26:23 -05:00
36c9f0048b manuel 2025-02-25 20:13:26 -05:00
cdd304f9e9 dashboard requin + nettoyage code 2025-02-25 18:08:14 -05:00
1157bdf76a limit requin 2025-02-25 18:05:00 -05:00
17f3f697b9 dashboard requin 2025-02-25 18:03:04 -05:00
88aa6db075 limit id 2025-02-25 17:57:57 -05:00
d538b368a7 encodeur baleeuse 2025-02-24 18:19:06 -05:00
b6d2ffd931 bas 2025-02-22 15:28:59 -05:00
f9d09106a4 dashboard 2025-02-22 15:21:04 -05:00
0524ec6355 oli code mal 2025-02-22 10:22:13 -05:00
a09fbcefce code mieux 2025-02-20 20:17:56 -05:00
7fd7c666f1 code mieux 2025-02-20 20:17:45 -05:00
29227dd2f6 code mieux 2025-02-20 20:10:58 -05:00
dc36eea320 requin 2025-02-19 17:21:37 -05:00
eaa14fb1b1 mieu ecrit 2025-02-12 16:52:10 -05:00
3458203225 leds baleeuse et saaaaaaaaaaam 2025-02-11 19:51:37 -05:00
6683613c7f command -> commands 2025-02-06 17:48:27 -05:00
2ac9cfe8ff simulation 2025-02-03 18:59:31 -05:00
56704c3e68 id 2025-02-03 18:53:33 -05:00
4c49ad4e51 touche requin 2025-01-29 19:45:46 -05:00
afe25cf046 pu L1 2025-01-29 19:41:28 -05:00
eec4eee2ff baleeuse 2025-01-28 19:34:18 -05:00
15be1d67ea L1 2025-01-28 18:05:47 -05:00
e4c7a12606 balaye 2025-01-28 18:02:53 -05:00
72da7b7d74 requin rotatione 2025-01-28 17:56:40 -05:00
fd8ab8663b baleeuse 2025-01-27 20:14:20 -05:00
11 changed files with 508 additions and 2 deletions

View File

@ -0,0 +1,63 @@
// 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.Command;
import frc.robot.subsystems.Bougie;
import frc.robot.subsystems.Requin;
/* 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 BalayeuseAlgue extends Command {
private Requin requin;
private Bougie bougie;
/** Creates a new Balayeuse. */
public BalayeuseAlgue(Requin requin, Bougie bougie) {
this.requin = requin;
this.bougie =bougie;
addRequirements(requin,bougie);
// 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() {
if(requin.encodeur()>=500 && requin.encodeur()<=510)
{
requin.rotationer(0);
if(requin.amp()> 60){
requin.balaye(0);
bougie.Vert();
}
else
{
requin.balaye(0.5);
}
}
else if(requin.encodeur()>=510){
requin.rotationer(0.5);
}
else{
requin.rotationer(-0.5);
}
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
requin.rotationer(0);
requin.balaye(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return false;
}
}

View 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.Command;
import frc.robot.subsystems.Requin;
/* 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 BalayeuseBas extends Command {
private Requin requin;
/** Creates a new Balayeuse. */
public BalayeuseBas(Requin requin) {
this.requin = requin;
addRequirements(requin);
// 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() {
requin.rotationer(-0.5);
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
requin.rotationer(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return false;
}
}

View File

@ -0,0 +1,67 @@
// 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.Command;
import frc.robot.subsystems.Bougie;
import frc.robot.subsystems.Requin;
/* 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 BalayeuseCoral extends Command {
private Requin requin;
private Bougie bougie;
/** Creates a new Balayeuse. */
public BalayeuseCoral(Requin requin, Bougie bougie) {
this.requin = requin;
this.bougie = bougie;
addRequirements(requin,bougie);
// 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() {
if(requin.encodeur()>=100 && requin.encodeur()<=110){
requin.rotationer(0);
if(requin.amp()>60){
requin.balaye(0);
bougie.Vert();
if(requin.enHaut()){
requin.rotationer(0);
}
else{
requin.rotationer(0.5);
}
}
else{
requin.balaye(0.5);
}
}
else if(requin.encodeur()>=110){
requin.rotationer(0.5);
}
else{
requin.rotationer(-0.5);
}
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
requin.rotationer(0);
requin.balaye(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return false;
}
}

View File

@ -0,0 +1,47 @@
// 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.Command;
import frc.robot.subsystems.Requin;
/* 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 BalayeuseHaut extends Command {
private Requin requin;
/** Creates a new Balayeuse. */
public BalayeuseHaut(Requin requin) {
this.requin = requin;
addRequirements(requin);
// 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() {
if(requin.enHaut()==true){
requin.rotationer(0);
requin.reset();
}
else{
requin.rotationer(-0.5);
}
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
requin.rotationer(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return false;
}
}

View File

@ -0,0 +1,41 @@
// 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.Command;
import frc.robot.subsystems.Requin;
/* 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 ExpireAlgue extends Command {
private Requin requin;
/** Creates a new ExpireAlgue. */
public ExpireAlgue(Requin requin) {
this.requin = requin;
addRequirements(requin);
// 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() {
requin.balaye(0.5);
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
requin.balaye(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return false;
}
}

View File

@ -0,0 +1,65 @@
// 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.Command;
import frc.robot.subsystems.Bougie;
import frc.robot.subsystems.Requin;
/* 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 L1Requin extends Command {
private Requin requin;
private Bougie bougie;
/** Creates a new Balayeuse. */
public L1Requin(Requin requin,Bougie bougie) {
this.requin = requin;
this.bougie = bougie;
addRequirements(requin,bougie);
// 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() {
if(requin.encodeur()>=800 && requin.encodeur()<=810){
requin.rotationer(0);
if(requin.amp()>8){
requin.balaye(-0.5);
}
else{
requin.balaye(0);
bougie.Rouge();
}
}
else if(requin.encodeur()>=810){
requin.rotationer(0.5);
}
else{
requin.rotationer(-0.5);
}
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
requin.rotationer(0);
requin.balaye(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return false;
}
}

View File

@ -0,0 +1,41 @@
// 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.Command;
import frc.robot.subsystems.Requin;
/* 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 aspire extends Command {
/** Creates a new aspire. */
private Requin requin;
public aspire(Requin requin) {
// Use addRequirements() here to declare subsystem dependencies.
this.requin = requin;
addRequirements(requin);
}
// 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() {
requin.balaye(0.3);
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
requin.balaye(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return false;
}
}

View File

@ -0,0 +1,41 @@
// 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.Command;
import frc.robot.subsystems.Requin;
/* 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 exspire extends Command {
/** Creates a new aspire. */
private Requin requin;
public exspire(Requin requin) {
// Use addRequirements() here to declare subsystem dependencies.
this.requin = requin;
addRequirements(requin);
}
// 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() {
requin.balaye(-0.3);
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
requin.balaye(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return false;
}
}

View File

@ -0,0 +1,49 @@
// 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 java.util.function.DoubleSupplier;
import edu.wpi.first.wpilibj2.command.Command;
import frc.robot.subsystems.Requin;
/* 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 requin_manuel extends Command {
/** Creates a new requin_manuel. */
private Requin requin;
private DoubleSupplier x;
public requin_manuel(Requin requin) {
// Use addRequirements() here to declare subsystem dependencies.
this.requin = requin;
addRequirements(requin);
}
// 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() {
if(requin.enHaut()){
requin.rotationer(0);
}
else{
requin.rotationer(x.getAsDouble());
}
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
requin.rotationer(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return false;
}
}

View File

@ -43,8 +43,12 @@ public class Bougie extends SubsystemBase {
candle.setLEDs(255, 215, 0,0,48,8); candle.setLEDs(255, 215, 0,0,48,8);
candle.setLEDs(255, 215, 0,0,64,8); candle.setLEDs(255, 215, 0,0,64,8);
} }
public void RainBow(){candle.animate(rainbowAnim);} public void RainBow(){
public void RainBowStop(){candle.animate(null);} candle.animate(rainbowAnim);
}
public void RainBowStop(){
candle.animate(null);
}
@Override @Override
public void periodic() { public void periodic() {
// This method will be called once per scheduler run // This method will be called once per scheduler run

View File

@ -0,0 +1,48 @@
// 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.subsystems;
import com.revrobotics.spark.SparkFlex;
import com.revrobotics.spark.SparkMax;
import com.revrobotics.spark.SparkLowLevel.MotorType;
import edu.wpi.first.wpilibj.DigitalInput;
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
public class Requin extends SubsystemBase {
/** Creates a new Requin. */
ShuffleboardTab teb = Shuffleboard.getTab("teb");
public Requin() {
teb.addBoolean("limit requin", this::enHaut);
}
final SparkFlex balaye = new SparkFlex(15, MotorType.kBrushless);
final SparkMax rotatione = new SparkMax(17, MotorType.kBrushless);
final DigitalInput limit3 = new DigitalInput(1);
public void balaye(double vitesse){
balaye.set(vitesse);
}
public void rotationer(double vitesse){
rotatione.set(vitesse);
}
public boolean enHaut(){
return limit3.get();
}
public double encodeur(){
return rotatione.getEncoder().getPosition();
}
public void reset(){
rotatione.getEncoder().setPosition(0);
}
public double amp(){
return balaye.getOutputCurrent();
}
@Override
public void periodic() {
// This method will be called once per scheduler run
}
}