From cdd304f9e9a381b0c6f66b352cd5117147da046f Mon Sep 17 00:00:00 2001
From: Antoine PerreaultE <KalcioGx53@hotmail.com>
Date: Tue, 25 Feb 2025 18:08:14 -0500
Subject: [PATCH] dashboard requin + nettoyage code
---
src/main/java/frc/robot/RobotContainer.java | 11 ++++++-----
src/main/java/frc/robot/subsystems/Requin.java | 7 +------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 36e2ee1..02b4ec4 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -15,19 +15,20 @@ import frc.robot.commands.L1Requin;
import frc.robot.subsystems.Requin;
import frc.robot.subsystems.Bougie;
public class RobotContainer {
- CommandXboxController manette1 = new CommandXboxController(0);
- CommandXboxController manette2 = new CommandXboxController(1);
- Requin requin = new Requin();
- Bougie bougie = new Bougie();
+CommandXboxController manette1 = new CommandXboxController(0);
+CommandXboxController manette2 = new CommandXboxController(1);
+Requin requin = new Requin();
+Bougie bougie = new Bougie();
+
public RobotContainer() {
configureBindings();
}
private void configureBindings() {
+ manette2.a().whileTrue(new BalayeuseBas(requin));
manette2.b().whileTrue(new BalayeuseAlgue(requin, bougie));
manette2.x().whileTrue(new BalayeuseCoral(requin, bougie));
manette2.y().whileTrue(new L1Requin(requin,bougie));
- manette2.a().whileTrue(new BalayeuseBas(requin));
manette2.rightBumper().whileTrue(new BalayeuseHaut(requin));
}
diff --git a/src/main/java/frc/robot/subsystems/Requin.java b/src/main/java/frc/robot/subsystems/Requin.java
index 4252146..db0e3c4 100644
--- a/src/main/java/frc/robot/subsystems/Requin.java
+++ b/src/main/java/frc/robot/subsystems/Requin.java
@@ -7,13 +7,9 @@ package frc.robot.subsystems;
import com.revrobotics.spark.SparkFlex;
import com.revrobotics.spark.SparkMax;
import com.revrobotics.spark.SparkLowLevel.MotorType;
-
-import edu.wpi.first.networktables.GenericEntry;
import edu.wpi.first.wpilibj.DigitalInput;
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
-import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardComponent;
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
-import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
public class Requin extends SubsystemBase {
@@ -22,11 +18,10 @@ public class Requin extends SubsystemBase {
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);