From 4f075e615c4f8c33d3164acdcb33c21585a35d18 Mon Sep 17 00:00:00 2001 From: EdwardFaucher Date: Wed, 22 Feb 2023 19:08:17 -0500 Subject: [PATCH 1/5] hg --- src/main/java/frc/robot/RobotContainer.java | 2 +- src/main/java/frc/robot/subsystems/BasePilotable.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 20a459a..d9ff154 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -69,7 +69,7 @@ public RobotContainer() { manette1.a().toggleOnTrue(Commands.startEnd(pince::ouvrir, pince::fermer,pince)); manette1.x().toggleOnTrue(Commands.startEnd(basePilotable::BrakeFerme,basePilotable::BrakeOuvre,basePilotable)); manette1.y().whileTrue(gyro); - manette1.b().toggleOnTrue(Commands.startEnd(gratte::baiser, gratte::Lever,gratte)); + // manette1.b().toggleOnTrue(Commands.startEnd(gratte::baiser, gratte::Lever,gratte)); manette1.start().toggleOnTrue(Commands.startEnd(basePilotable::resetGyro, basePilotable::resetGyro, basePilotable)); } diff --git a/src/main/java/frc/robot/subsystems/BasePilotable.java b/src/main/java/frc/robot/subsystems/BasePilotable.java index 6ed4487..5ec5abc 100644 --- a/src/main/java/frc/robot/subsystems/BasePilotable.java +++ b/src/main/java/frc/robot/subsystems/BasePilotable.java @@ -19,11 +19,11 @@ import edu.wpi.first.wpilibj2.command.SubsystemBase; import frc.robot.Constants; public class BasePilotable extends SubsystemBase { - final CANSparkMax avantdroit = new CANSparkMax(Constants.avantdroit, MotorType.kBrushless); + final CANSparkMax avantd = new CANSparkMax(Constants.avantdroit, MotorType.kBrushless); final CANSparkMax avantgauche = new CANSparkMax(Constants.avantgauche, MotorType.kBrushless); final CANSparkMax arrieredroit = new CANSparkMax(Constants.arrieredroit, MotorType.kBrushless); final CANSparkMax arrieregauche = new CANSparkMax(Constants.arrieregauche, MotorType.kBrushless); - final MotorControllerGroup droit = new MotorControllerGroup(avantdroit, arrieredroit); + final MotorControllerGroup droit = new MotorControllerGroup(avantd, arrieredroit); final MotorControllerGroup gauche = new MotorControllerGroup(avantgauche, arrieregauche); final DifferentialDrive drive = new DifferentialDrive(gauche, droit); @@ -41,13 +41,13 @@ public class BasePilotable extends SubsystemBase { drive.arcadeDrive(xSpeed, zRotation); } public double distance(){ - return (-avantdroit.getEncoder().getPosition() + return (-avantd.getEncoder().getPosition() +avantgauche.getEncoder().getPosition() -arrieredroit.getEncoder().getPosition() +arrieregauche.getEncoder().getPosition()) / 4; } public void Reset() { - avantdroit.getEncoder().setPosition(0); + avantd.getEncoder().setPosition(0); avantgauche.getEncoder().setPosition(0); arrieredroit.getEncoder().setPosition(0); arrieregauche.getEncoder().setPosition(0); From 1862402ba070079422d5c100ecaefb9f4b6ca4d5 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Wed, 22 Feb 2023 19:10:42 -0500 Subject: [PATCH 2/5] jhgfd --- .../java/frc/robot/subsystems/bras/BrasTelescopique.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java index 94ed0f7..09bc449 100644 --- a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java +++ b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java @@ -12,13 +12,18 @@ import edu.wpi.first.wpilibj.DigitalInput; import edu.wpi.first.wpilibj.DoubleSolenoid; import edu.wpi.first.wpilibj.PneumaticsModuleType; import edu.wpi.first.wpilibj.DoubleSolenoid.Value; +import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts; import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; +import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout; import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab; import edu.wpi.first.wpilibj2.command.SubsystemBase; import frc.robot.Constants; public class BrasTelescopique extends SubsystemBase { ShuffleboardTab teb = Shuffleboard.getTab("teb"); + ShuffleboardLayout winch = Shuffleboard.getTab("teb") + .getLayout("winch", BuiltInLayouts.kList) + .withSize(2, 2); /** Creates a new BrasTelescopique. */ public BrasTelescopique() {} final CANSparkMax Winch = new CANSparkMax(Constants.BrasTelescopique,MotorType.kBrushless); @@ -47,6 +52,4 @@ public class BrasTelescopique extends SubsystemBase { teb .add("``photocell``",0.1); teb .add("winch",0.1); } - - } From e573024e4ba0c473935e45d1ba5c18544c06f7e1 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Wed, 22 Feb 2023 19:13:36 -0500 Subject: [PATCH 3/5] 45re --- .../java/frc/robot/subsystems/bras/BrasTelescopique.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java index 09bc449..2d744a0 100644 --- a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java +++ b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java @@ -21,8 +21,8 @@ import frc.robot.Constants; public class BrasTelescopique extends SubsystemBase { ShuffleboardTab teb = Shuffleboard.getTab("teb"); - ShuffleboardLayout winch = Shuffleboard.getTab("teb") - .getLayout("winch", BuiltInLayouts.kList) + ShuffleboardLayout layout = Shuffleboard.getTab("teb") + .getLayout("layout", BuiltInLayouts.kList) .withSize(2, 2); /** Creates a new BrasTelescopique. */ public BrasTelescopique() {} @@ -49,7 +49,7 @@ public class BrasTelescopique extends SubsystemBase { } @Override public void periodic() { - teb .add("``photocell``",0.1); + teb .add("photocell",0.1); teb .add("winch",0.1); } } From ac593c7f31b99d2e435de3b86f5b309da799096b Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Wed, 22 Feb 2023 19:16:07 -0500 Subject: [PATCH 4/5] thgf --- src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java index 2d744a0..f606459 100644 --- a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java +++ b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java @@ -52,4 +52,4 @@ public class BrasTelescopique extends SubsystemBase { teb .add("photocell",0.1); teb .add("winch",0.1); } -} +} \ No newline at end of file From e0fdb52d4f9562550150d574a842f8d07c1d716b Mon Sep 17 00:00:00 2001 From: Olivier Demers Date: Thu, 23 Feb 2023 15:44:07 +0000 Subject: [PATCH 5/5] fixed merge artifacts --- src/main/java/frc/robot/RobotContainer.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index a68150c..5a4db6b 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -75,10 +75,7 @@ public RobotContainer() { manette1.a().toggleOnTrue(Commands.startEnd(pince::ouvrir, pince::fermer,pince)); manette1.x().toggleOnTrue(Commands.startEnd(basePilotable::BrakeFerme,basePilotable::BrakeOuvre,basePilotable)); manette1.y().whileTrue(gyro); -<<<<<<< HEAD // manette1.b().toggleOnTrue(Commands.startEnd(gratte::baiser, gratte::Lever,gratte)); -======= ->>>>>>> 4b22cac30fd2b3c5e7b1af3c7f890c4def2d21f7 manette1.start().toggleOnTrue(Commands.startEnd(basePilotable::resetGyro, basePilotable::resetGyro, basePilotable)); manette1.b().toggleOnTrue(Commands.startEnd(gratte::baiser, gratte::Lever,gratte)); manette2.a().toggleOnTrue(Commands.startEnd(brasTelescopique::pivoteBrasHaut, brasTelescopique::pivoteBrasHaut));