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

message

Browse Source
This commit is contained in:
samuel desharnais 2025-02-10 20:00:26 -05:00
parent cbeb99c1a5
commit c0c48a3f24
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,18 +20,6 @@ import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.Commands; import edu.wpi.first.wpilibj2.command.Commands;
<<<<<<< HEAD
import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
public class RobotContainer {
private final CommandXboxController manette1 = new CommandXboxController(0);
private final CommandXboxController manette2 = new CommandXboxController(0);
public RobotContainer() {
=======
import edu.wpi.first.wpilibj2.command.ParallelCommandGroup; import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
import edu.wpi.first.wpilibj2.command.button.CommandXboxController; import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
import edu.wpi.first.wpilibj2.command.sysid.SysIdRoutine.Direction; import edu.wpi.first.wpilibj2.command.sysid.SysIdRoutine.Direction;
@ -66,24 +54,12 @@ public class RobotContainer {
public RobotContainer() { public RobotContainer() {
autoChooser = AutoBuilder.buildAutoChooser("New Auto"); autoChooser = AutoBuilder.buildAutoChooser("New Auto");
SmartDashboard.putData("Auto Mode", autoChooser); SmartDashboard.putData("Auto Mode", autoChooser);
>>>>>>> Swerve
configureBindings(); configureBindings();
} }
private void configureBindings() { private void configureBindings() {
// Note that X is defined as forward according to WPILib convention, // Note that X is defined as forward according to WPILib convention,
// and Y is defined as to the left according to WPILib convention. // and Y is defined as to the left according to WPILib convention.
<<<<<<< HEAD
// Run SysId routines when holding back/start and X/Y.
// Note that each routine should be run exactly once in a single log.
}
public Command getAutonomousCommand() {
return Commands.print("");
}
=======
drivetrain.setDefaultCommand( drivetrain.setDefaultCommand(
// Drivetrain will execute this command periodically // Drivetrain will execute this command periodically
drivetrain.applyRequest(() -> drivetrain.applyRequest(() ->
@ -114,5 +90,4 @@ public class RobotContainer {
) )
); );
} }
>>>>>>> Swerve
} }