PLS5618/robot-2023
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

re

Browse Source
This commit is contained in:
Olivier Dubois 2023-03-13 18:38:08 -04:00
parent ee17a7cfad
commit d39a7fa643
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/frc/robot/RobotContainer.java
View File

@ -18,7 +18,6 @@ import edu.wpi.first.wpilibj2.command.InstantCommand;
import edu.wpi.first.wpilibj2.command.RunCommand; import edu.wpi.first.wpilibj2.command.RunCommand;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import edu.wpi.first.wpilibj2.command.button.CommandXboxController; import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
<<<<<<< HEAD
//subsystems //subsystems
import frc.robot.subsystems.BasePilotable; import frc.robot.subsystems.BasePilotable;
@ -28,10 +27,6 @@ import frc.robot.subsystems.bras.Pince;
import frc.robot.subsystems.bras.Pivot; import frc.robot.subsystems.bras.Pivot;
import frc.robot.subsystems.Limelight; import frc.robot.subsystems.Limelight;
import frc.robot.commands.Apriltag; import frc.robot.commands.Apriltag;
=======
import frc.robot.commands.Apriltag;
import frc.robot.commands.Avancer;
>>>>>>> de5b5213cba2b66ec7b8cc5e73c1bf9123dd259b
// command // command
import frc.robot.commands.BrakeFerme; import frc.robot.commands.BrakeFerme;
import frc.robot.commands.BrakeOuvre; import frc.robot.commands.BrakeOuvre;
@ -50,13 +45,6 @@ import frc.robot.commands.bras.PivotChercheHaut;
import frc.robot.commands.bras.PivoteBrasBas; import frc.robot.commands.bras.PivoteBrasBas;
import frc.robot.commands.bras.PivoteBrasHaut; import frc.robot.commands.bras.PivoteBrasHaut;
import frc.robot.commands.bras.PivoteBrasMilieux; import frc.robot.commands.bras.PivoteBrasMilieux;
//subsystems
import frc.robot.subsystems.BasePilotable;
import frc.robot.subsystems.Gratte;
import frc.robot.subsystems.Limelight;
import frc.robot.subsystems.bras.BrasTelescopique;
import frc.robot.subsystems.bras.Pince;
import frc.robot.subsystems.bras.Pivot;
public class RobotContainer { public class RobotContainer {
@ -115,18 +103,10 @@ public RobotContainer() {
layoutauto.add("choix hauteur",chooser); layoutauto.add("choix hauteur",chooser);
configureBindings(); configureBindings();
CameraServer.startAutomaticCapture(); CameraServer.startAutomaticCapture();
<<<<<<< HEAD
teb.add (CameraServer.startAutomaticCapture(null, 0));
basePilotable.setDefaultCommand(new RunCommand()->
basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX(), 0));
}
=======
basePilotable.setDefaultCommand(new RunCommand(() -> { basePilotable.setDefaultCommand(new RunCommand(() -> {
basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX()); basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX());
})); }));
} }
>>>>>>> de5b5213cba2b66ec7b8cc5e73c1bf9123dd259b
private void configureBindings() { private void configureBindings() {
// manette 1 // manette 1
manette1.a().toggleOnTrue(Commands.startEnd(pince::ouvrir, pince::fermer,pince)); manette1.a().toggleOnTrue(Commands.startEnd(pince::ouvrir, pince::fermer,pince));

3
src/main/java/frc/robot/commands/Reculer.java
View File

@ -7,9 +7,6 @@ package frc.robot.commands;
import java.util.function.DoubleSupplier; import java.util.function.DoubleSupplier;
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase; import edu.wpi.first.wpilibj2.command.CommandBase;
import frc.robot.subsystems.BasePilotable; import frc.robot.subsystems.BasePilotable;