Merge branch 'main' of https://git.demerso.net/pls5618/2024/robot

.gitlab-ci.yml

@@ -0,0 +1,13 @@
+default:
+  image: gradle:jdk17
+  tags:
+    - robot
+
+stages:          # List of stages for jobs, and their order of execution
+  - build
+
+build-job:       # This job runs in the build stage, which runs first.
+  stage: build
+  script:
+    - chmod +x gradlew
+    - ./gradlew build

src/main/java/frc/robot/RobotContainer.java

@@ -11,12 +11,17 @@ import edu.wpi.first.wpilibj2.command.Commands;
 import edu.wpi.first.wpilibj2.command.RunCommand;
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
 // Manette
+
+// Manettes
 import edu.wpi.first.wpilibj2.command.button.CommandJoystick;
 import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
+
+// Commands
 import frc.robot.command.Balayer;
 import frc.robot.command.GuiderBas;
 import frc.robot.command.GuiderHaut;
-// Subsystem
+
+// Subsystems
 import frc.robot.subsystem.Accumulateur;
 import frc.robot.subsystem.Balayeuse;
 import frc.robot.subsystem.Drive;

src/main/java/frc/robot/command/Balayer.java

@@ -14,6 +14,7 @@ public class Balayer extends Command {
   /** Creates a new Balayer. */
   public Balayer(Balayeuse balayeuse, Accumulateur accumulateur) {
     this.balayeuse = balayeuse; 
+    this.accumulateur = accumulateur;
     addRequirements(balayeuse, accumulateur);}
     // Use addRequirements() here to declare subsystem dependencies.
   // Called when the command is initially scheduled.

src/main/java/frc/robot/subsystem/Accumulateur.java

@@ -9,7 +9,8 @@ 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.Shuffleboard;
+import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
 import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
 import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout;