28 Commits

Author SHA1 Message Date
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
15 changed files with 530 additions and 138 deletions

109
simgui-ds.json Normal file
View File

@ -0,0 +1,109 @@
{
"FMS": {
"window": {
"visible": false
}
},
"Joysticks": {
"window": {
"visible": false
}
},
"keyboardJoysticks": [
{
"axisConfig": [
{
"decKey": 65,
"incKey": 68
},
{
"decKey": 87,
"incKey": 83
},
{
"decKey": 69,
"decayRate": 0.0,
"incKey": 82,
"keyRate": 0.009999999776482582
}
],
"axisCount": 3,
"buttonCount": 4,
"buttonKeys": [
90,
88,
67,
86
],
"povConfig": [
{
"key0": 328,
"key135": 323,
"key180": 322,
"key225": 321,
"key270": 324,
"key315": 327,
"key45": 329,
"key90": 326
}
],
"povCount": 1
},
{
"axisConfig": [
{
"decKey": 74,
"incKey": 76
},
{
"decKey": 73,
"incKey": 75
}
],
"axisCount": 2,
"buttonCount": 4,
"buttonKeys": [
77,
44,
46,
47
],
"povCount": 0
},
{
"axisConfig": [
{
"decKey": 263,
"incKey": 262
},
{
"decKey": 265,
"incKey": 264
}
],
"axisCount": 2,
"buttonCount": 6,
"buttonKeys": [
260,
268,
266,
261,
269,
267
],
"povCount": 0
},
{
"axisCount": 0,
"buttonCount": 0,
"povCount": 0
}
],
"robotJoysticks": [
{},
{
"guid": "78696e70757401000000000000000000",
"useGamepad": true
}
]
}

View File

@ -4,15 +4,44 @@
package frc.robot;
import edu.wpi.first.math.MathUtil;
import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.Commands;
import edu.wpi.first.wpilibj2.command.RunCommand;
import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
import frc.robot.commands.BalayeuseAlgue;
import frc.robot.commands.BalayeuseBas;
import frc.robot.commands.BalayeuseCoral;
import frc.robot.commands.BalayeuseHaut;
import frc.robot.commands.L1Requin;
import frc.robot.commands.aspire;
import frc.robot.commands.exspire;
import frc.robot.commands.requin_manuel;
import frc.robot.subsystems.Requin;
import frc.robot.subsystems.Bougie;
import frc.robot.commands.aspire;
public class RobotContainer {
CommandXboxController manette1 = new CommandXboxController(0);
CommandXboxController manette2 = new CommandXboxController(1);
Requin requin = new Requin();
Bougie bougie = new Bougie();
aspire aspire = new aspire(requin);
requin_manuel requin_manuel = new requin_manuel(requin);
public RobotContainer() {
configureBindings();
requin.setDefaultCommand(new RunCommand(()->{
requin.rotationer(MathUtil.applyDeadband(manette2.getRightY(), 0.2));
}, requin));
}
private void configureBindings() {}
private void configureBindings() {
manette2.a().whileTrue(new aspire(requin));
manette2.rightTrigger().whileTrue(new exspire(requin));
manette2.b().whileTrue(new BalayeuseAlgue(requin, bougie));
manette2.x().whileTrue(new BalayeuseCoral(requin, bougie));
manette2.y().whileTrue(new L1Requin(requin,bougie));
manette2.rightBumper().whileTrue(new BalayeuseHaut(requin));
}
public Command getAutonomousCommand() {
return Commands.print("No autonomous command configured");

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

@ -5,15 +5,15 @@
package frc.robot.commands;
import edu.wpi.first.wpilibj2.command.Command;
import frc.robot.subsystems.Elevateur;
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 Depart extends Command {
private Elevateur elevateur;
/** Creates a new L2. */
public Depart(Elevateur elevateur) {
this.elevateur = elevateur;
addRequirements(elevateur);
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.
}
@ -24,24 +24,24 @@ public class Depart extends Command {
// Called every time the scheduler runs while the command is scheduled.
@Override
public void execute() {
if(elevateur.limit2()==true){
elevateur.vitesse(0);
elevateur.reset();
if(requin.enHaut()==true){
requin.rotationer(0);
requin.reset();
}
else{
elevateur.vitesse(-.5);
requin.rotationer(-0.5);
}
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
elevateur.vitesse(0);
requin.rotationer(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return elevateur.limit2()==true;
return false;
}
}

View File

@ -5,15 +5,15 @@
package frc.robot.commands;
import edu.wpi.first.wpilibj2.command.Command;
import frc.robot.subsystems.Elevateur;
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 L3 extends Command {
private Elevateur elevateur;
/** Creates a new L2. */
public L3(Elevateur elevateur) {
this.elevateur = elevateur;
addRequirements(elevateur);
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.
}
@ -24,21 +24,13 @@ public class L3 extends Command {
// Called every time the scheduler runs while the command is scheduled.
@Override
public void execute() {
if(elevateur.position()>=700 && elevateur.position()<=710){
elevateur.vitesse(0);
}
else if(elevateur.position()>=510){
elevateur.vitesse(-0.5);
}
else{
elevateur.vitesse(.5);
}
requin.balaye(0.5);
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
elevateur.vitesse(0);
requin.balaye(0);
}
// Returns true when the command should end.

View File

@ -4,20 +4,19 @@
package frc.robot.commands;
import java.util.function.DoubleSupplier;
import edu.wpi.first.wpilibj2.command.Command;
import frc.robot.subsystems.Elevateur;
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 ElevateurManuel extends Command {
private DoubleSupplier doubleSupplier;
private Elevateur elevateur;
/** Creates a new ElevateurManuel. */
public ElevateurManuel(Elevateur elevateur,DoubleSupplier doubleSupplier) {
this.doubleSupplier = doubleSupplier;
this.elevateur = elevateur;
addRequirements(elevateur);
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.
}
@ -28,16 +27,34 @@ public class ElevateurManuel extends Command {
// Called every time the scheduler runs while the command is scheduled.
@Override
public void execute() {
if(elevateur.limit2()==true){
elevateur.vitesse(0);
if(requin.encodeur()>=800 && requin.encodeur()<=810){
requin.rotationer(0);
if(requin.amp()>8){
requin.balaye(-0.5);
}
elevateur.vitesse(doubleSupplier.getAsDouble());
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) {
elevateur.vitesse(0);
requin.rotationer(0);
requin.balaye(0);
}
// Returns true when the command should end.

View File

@ -5,16 +5,16 @@
package frc.robot.commands;
import edu.wpi.first.wpilibj2.command.Command;
import frc.robot.subsystems.Elevateur;
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 L4 extends Command {
private Elevateur elevateur;
/** Creates a new L2. */
public L4(Elevateur elevateur) {
this.elevateur = elevateur;
addRequirements(elevateur);
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.
@ -24,26 +24,18 @@ public class L4 extends Command {
// Called every time the scheduler runs while the command is scheduled.
@Override
public void execute() {
if(elevateur.position()>=800 && elevateur.position()<=810){
elevateur.vitesse(0);
}
else if(elevateur.position()>=810){
elevateur.vitesse(-0.5);
}
else{
elevateur.vitesse(.5);
}
requin.balaye(0.3);
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
elevateur.vitesse(0);
requin.balaye(0);
}
// Returns true when the command should end.
@Override
public boolean isFinished() {
return elevateur.position()>=800;
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

@ -4,17 +4,20 @@
package frc.robot.commands;
import java.util.function.DoubleSupplier;
import edu.wpi.first.wpilibj2.command.Command;
import frc.robot.subsystems.Elevateur;
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 L2 extends Command {
private Elevateur elevateur;
/** Creates a new L2. */
public L2(Elevateur elevateur) {
this.elevateur = elevateur;
addRequirements(elevateur);
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.
@ -24,22 +27,18 @@ public class L2 extends Command {
// Called every time the scheduler runs while the command is scheduled.
@Override
public void execute() {
if(elevateur.position()>=500 && elevateur.position()<=510){
elevateur.vitesse(0);
}
else if(elevateur.position()>=510){
elevateur.vitesse(-0.3);
if(requin.enHaut()){
requin.rotationer(0);
}
else{
elevateur.vitesse(.3);
requin.rotationer(x.getAsDouble());
}
}
// Called once the command ends or is interrupted.
@Override
public void end(boolean interrupted) {
elevateur.vitesse(0);
requin.rotationer(0);
}
// Returns true when the command should end.

View File

@ -0,0 +1,53 @@
// 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.ctre.phoenix.led.CANdle;
import com.ctre.phoenix.led.CANdleConfiguration;
import com.ctre.phoenix.led.RainbowAnimation;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
public class Bougie extends SubsystemBase {
CANdle candle = new CANdle(23);
CANdleConfiguration config = new CANdleConfiguration();
RainbowAnimation rainbowAnim = new RainbowAnimation(1, 0.5, 64);
/** Creates a new Bougie. */
public Bougie() {
config.brightnessScalar = 0.5;
candle.configAllSettings(config);
}
public void Rouge() {
candle.setLEDs(255, 0, 0,0,8,8);
candle.setLEDs(255, 0, 0,0,24,8);
candle.setLEDs(255, 0, 0,0,40,8);
candle.setLEDs(255, 0, 0,0,56,8);
}
public void Vert() {
candle.setLEDs(0, 255, 0,0,8,8);
candle.setLEDs(0, 255, 0,0,24,8);
candle.setLEDs(0, 255, 0,0,40,8);
candle.setLEDs(0, 255, 0,0,56,8);
}
public void Bleu() {
candle.setLEDs(0, 0, 255,0,16,8);
candle.setLEDs(0, 0, 255,0,32,8);
candle.setLEDs(0, 0, 255,0,48,8);
candle.setLEDs(0, 0, 255,0,64,8);
}
public void Jaune() {
candle.setLEDs(255, 215, 0,0,16,8);
candle.setLEDs(255, 215, 0,0,32,8);
candle.setLEDs(255, 215, 0,0,48,8);
candle.setLEDs(255, 215, 0,0,64,8);
}
public void RainBow(){
candle.animate(rainbowAnim);}
public void RainBowStop(){candle.animate(null);}
@Override
public void periodic() {
// This method will be called once per scheduler run
}
}

View File

@ -1,32 +0,0 @@
// 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 edu.wpi.first.wpilibj.DigitalInput;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import com.revrobotics.spark.SparkMax;
import com.revrobotics.spark.SparkLowLevel.MotorType;
public class Elevateur extends SubsystemBase {
/** Creates a new Elevateur. */
public Elevateur() {}
final SparkMax monte = new SparkMax(22, MotorType.kBrushless);
final DigitalInput limit2 = new DigitalInput(0);
public double position(){
return monte.getEncoder().getPosition();
}
public void vitesse(double vitesse){
monte.set(vitesse);
}
public boolean limit2(){
return limit2.get();
}
public void reset(){
monte.getEncoder().setPosition(0);
}
@Override
public void periodic() {
// This method will be called once per scheduler run
}
}

View File

@ -1,26 +0,0 @@
// 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 edu.wpi.first.wpilibj.DigitalInput;
import edu.wpi.first.wpilibj.motorcontrol.Spark;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
public class Grimpeur extends SubsystemBase {
/** Creates a new Grimpeur. */
public Grimpeur() {}
final Spark grimpeur = new Spark(0);
final DigitalInput limit1 = new DigitalInput(0);
public void grimpe(double vitesse){
grimpeur.set(vitesse);
}
final void stop(){
limit1.get();
}
@Override
public void periodic() {
// 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
}
}