From 8d4d47504141423b046190f3f55e26641e862d8d Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Tue, 30 Jan 2024 19:54:07 -0500 Subject: [PATCH 1/5] ; --- src/main/java/frc/robot/RobotContainer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index cc4a6c6..4f8b451 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -10,13 +10,16 @@ import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; import edu.wpi.first.wpilibj2.command.RunCommand; -// 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; From 010264c09c9583b58ed3c345cedd12185c7166ef Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Tue, 30 Jan 2024 19:57:33 -0500 Subject: [PATCH 2/5] s --- src/main/java/frc/robot/command/Balayer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/frc/robot/command/Balayer.java b/src/main/java/frc/robot/command/Balayer.java index d13cb6d..31b57f1 100644 --- a/src/main/java/frc/robot/command/Balayer.java +++ b/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. From 948f725b3799b8742f2c6d030d652fe568a81d21 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Tue, 30 Jan 2024 20:02:47 -0500 Subject: [PATCH 3/5] b --- src/main/java/frc/robot/subsystem/Accumulateur.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/frc/robot/subsystem/Accumulateur.java b/src/main/java/frc/robot/subsystem/Accumulateur.java index 2ae3c97..fb3b646 100644 --- a/src/main/java/frc/robot/subsystem/Accumulateur.java +++ b/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; From f857cad15510778757f03468c3f7dc437bbf7af4 Mon Sep 17 00:00:00 2001 From: Olivier Demers Date: Wed, 31 Jan 2024 17:00:37 +0000 Subject: [PATCH 4/5] add build test --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..8738ecb --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,13 @@ +default: + image: gradle:jdk17-alpine + 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 From 900d7adf18f4915af25fde1d36add88312f75814 Mon Sep 17 00:00:00 2001 From: Olivier Demers Date: Wed, 31 Jan 2024 17:02:44 +0000 Subject: [PATCH 5/5] non-alpine gradle --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8738ecb..8a907cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ default: - image: gradle:jdk17-alpine + image: gradle:jdk17 tags: - robot