From ec42f43f89ff357708b87e9c6484bf67f2b407cb Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 13 Feb 2023 18:15:55 -0500 Subject: [PATCH 1/6] hgjkl --- src/main/java/frc/robot/Constants.java | 16 +--------------- src/main/java/frc/robot/subsystems/Gratte.java | 3 --- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java index 367a050..d4c7848 100644 --- a/src/main/java/frc/robot/Constants.java +++ b/src/main/java/frc/robot/Constants.java @@ -5,13 +5,8 @@ public class Constants { public static int avantgauche = 1; public static int arrieredroit = 2; public static int arrieregauche = 3; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= public static int leverGratte = 0; public static int baisserGratte = 1; ->>>>>>> Gratte // pneumatique public static int pistonpinceouvre = 0; public static int pistonpinceferme = 1; @@ -22,28 +17,19 @@ public class Constants { public static int limithg = 1; -======= -<<<<<<< HEAD public static int BrasTelescopique = 5; ->>>>>>> a6d29dff41c9186a3dd56354d6416a625159f366 -<<<<<<< HEAD -======= public static int actuateur = 4; ->>>>>>> 91d5a71d52bad9fc56b40c68d78207113e16cd21 -======= public static int actuateur = 4; ->>>>>>> Gratte -======= // pneumatique public static int pistonpinceouvre = 0; public static int pistonpinceferme = 1; public static int BrasTelescopique = 5; public static int actuateur = 4; ->>>>>>> 48259c9fcef533cfc4c76020b5b7862858c0627b + } diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java index 6dd93cb..ce446f9 100644 --- a/src/main/java/frc/robot/subsystems/Gratte.java +++ b/src/main/java/frc/robot/subsystems/Gratte.java @@ -4,14 +4,12 @@ package frc.robot.subsystems; -<<<<<<< HEAD import edu.wpi.first.wpilibj2.command.SubsystemBase; public class Gratte extends SubsystemBase { /** Creates a new Gratte. */ public Gratte() {} -======= import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; import com.fasterxml.jackson.annotation.JacksonInject.Value; @@ -46,7 +44,6 @@ public class Gratte extends SubsystemBase { baisserGratte.set(vitesse); leverGratte.set(vitesse); } ->>>>>>> Gratte @Override public void periodic() { // This method will be called once per scheduler run From 01059534a851f231f6fd21007ed350c55128cf5d Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 13 Feb 2023 18:21:10 -0500 Subject: [PATCH 2/6] ghjkl --- src/main/java/frc/robot/Constants.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java index d4c7848..22cff35 100644 --- a/src/main/java/frc/robot/Constants.java +++ b/src/main/java/frc/robot/Constants.java @@ -7,29 +7,24 @@ public class Constants { public static int arrieregauche = 3; public static int leverGratte = 0; public static int baisserGratte = 1; + public static int BrasTelescopique = 5; // pneumatique public static int pistonpinceouvre = 0; public static int pistonpinceferme = 1; + public static int actuateur = 4; // DIO public static int limitbd = 0; public static int limitbg = 2; public static int limithd = 3; public static int limithg = 1; - - public static int BrasTelescopique = 5; + - public static int actuateur = 4; - public static int actuateur = 4; - // pneumatique - public static int pistonpinceouvre = 0; - public static int pistonpinceferme = 1; - public static int BrasTelescopique = 5; - public static int actuateur = 4; + } From c9a2d5e391dc8ae03faa99d7d13ace554069ed6c Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Mon, 13 Feb 2023 18:22:46 -0500 Subject: [PATCH 3/6] hjkl --- src/main/java/frc/robot/subsystems/Gratte.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java index ce446f9..24c5104 100644 --- a/src/main/java/frc/robot/subsystems/Gratte.java +++ b/src/main/java/frc/robot/subsystems/Gratte.java @@ -5,18 +5,12 @@ package frc.robot.subsystems; import edu.wpi.first.wpilibj2.command.SubsystemBase; - -public class Gratte extends SubsystemBase { - /** Creates a new Gratte. */ - public Gratte() {} - import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; -import com.fasterxml.jackson.annotation.JacksonInject.Value; - import edu.wpi.first.wpilibj.DigitalInput; -import edu.wpi.first.wpilibj2.command.SubsystemBase; import frc.robot.Constants; + + public class Gratte extends SubsystemBase { private WPI_TalonSRX baisserGratte = new WPI_TalonSRX(Constants.leverGratte); private WPI_TalonSRX leverGratte = new WPI_TalonSRX(Constants.baisserGratte); From dcb02504140567f79ac3965eb3d3ba68d61ac269 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 13 Feb 2023 18:22:50 -0500 Subject: [PATCH 4/6] yrjgukfjm --- src/main/java/frc/robot/commands/bras/FermePince.java | 10 ++++++++-- src/main/java/frc/robot/commands/bras/OuvrePince.java | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/frc/robot/commands/bras/FermePince.java b/src/main/java/frc/robot/commands/bras/FermePince.java index ad2addc..609d44d 100644 --- a/src/main/java/frc/robot/commands/bras/FermePince.java +++ b/src/main/java/frc/robot/commands/bras/FermePince.java @@ -5,16 +5,22 @@ package frc.robot.commands.bras; import edu.wpi.first.wpilibj2.command.CommandBase; +import frc.robot.subsystems.bras.Pince; public class FermePince extends CommandBase { + private Pince pince; /** Creates a new FermePince. */ - public FermePince() { + public FermePince(Pince pince) { + this.pince = pince; // Use addRequirements() here to declare subsystem dependencies. + addRequirements(pince); } // Called when the command is initially scheduled. @Override - public void initialize() {} + public void initialize() { + pince.fermer(); + } // Called every time the scheduler runs while the command is scheduled. @Override diff --git a/src/main/java/frc/robot/commands/bras/OuvrePince.java b/src/main/java/frc/robot/commands/bras/OuvrePince.java index 0072fb9..2ad46c5 100644 --- a/src/main/java/frc/robot/commands/bras/OuvrePince.java +++ b/src/main/java/frc/robot/commands/bras/OuvrePince.java @@ -5,16 +5,22 @@ package frc.robot.commands.bras; import edu.wpi.first.wpilibj2.command.CommandBase; +import frc.robot.subsystems.bras.Pince; public class OuvrePince extends CommandBase { + private Pince pince; /** Creates a new OuvrePince. */ - public OuvrePince() { + public OuvrePince(Pince pince) { + this.pince = pince; // Use addRequirements() here to declare subsystem dependencies. + addRequirements(pince); } // Called when the command is initially scheduled. @Override - public void initialize() {} + public void initialize() { + pince.ouvrir(); + } // Called every time the scheduler runs while the command is scheduled. @Override From bc046af400056033021fe3cbf3717473bbd0e718 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 13 Feb 2023 18:24:46 -0500 Subject: [PATCH 5/6] khfvg,jvbm --- src/main/java/frc/robot/subsystems/Gratte.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java index ce446f9..c8b6c45 100644 --- a/src/main/java/frc/robot/subsystems/Gratte.java +++ b/src/main/java/frc/robot/subsystems/Gratte.java @@ -6,15 +6,11 @@ package frc.robot.subsystems; import edu.wpi.first.wpilibj2.command.SubsystemBase; -public class Gratte extends SubsystemBase { - /** Creates a new Gratte. */ - public Gratte() {} import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; -import com.fasterxml.jackson.annotation.JacksonInject.Value; import edu.wpi.first.wpilibj.DigitalInput; -import edu.wpi.first.wpilibj2.command.SubsystemBase; + import frc.robot.Constants; public class Gratte extends SubsystemBase { From 0c37463a91f99a8623a1405743145ad70a140362 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 13 Feb 2023 18:25:35 -0500 Subject: [PATCH 6/6] hlk --- src/main/java/frc/robot/subsystems/Gratte.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java index 453510a..24c5104 100644 --- a/src/main/java/frc/robot/subsystems/Gratte.java +++ b/src/main/java/frc/robot/subsystems/Gratte.java @@ -5,12 +5,6 @@ package frc.robot.subsystems; import edu.wpi.first.wpilibj2.command.SubsystemBase; - - -import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; - -import edu.wpi.first.wpilibj.DigitalInput; - import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; import edu.wpi.first.wpilibj.DigitalInput; import frc.robot.Constants;