Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.

Commit 485f170

Browse files
committed
add robot drive commands
1 parent d41545e commit 485f170

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/main/java/frc/robot/Robot.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import dev.doglog.DogLog;
44
import dev.doglog.DogLogOptions;
5+
import edu.wpi.first.wpilibj.DriverStation;
56
import edu.wpi.first.wpilibj.TimedRobot;
67
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
78
import edu.wpi.first.wpilibj2.command.Command;
@@ -31,7 +32,7 @@ public class Robot extends TimedRobot {
3132
private final ArmSubsystem arm = new ArmSubsystem(hardware.armLeft, hardware.armRight);
3233
private final IntakeSubsystem intake =
3334
new IntakeSubsystem(hardware.intakeMain, hardware.intakeCenteringMotor);
34-
private final SwerveSubsystem swerve = new SwerveSubsystem(hardware.driverController);
35+
private final SwerveSubsystem swerve = new SwerveSubsystem();
3536
private final ImuSubsystem imu = new ImuSubsystem(swerve.drivetrainPigeon);
3637
private final Autos autos = new Autos();
3738
private final RobotCommands robotCommands = new RobotCommands(null);
@@ -131,7 +132,11 @@ public void testPeriodic() {}
131132
public void testExit() {}
132133

133134
private void configureBindings() {
134-
// TODO: Swerve button bindings
135+
swerve.setDefaultCommand(swerve.run(() -> {
136+
if (DriverStation.isTeleop()) {
137+
swerve.driveTeleop(hardware.driverController.getLeftX(),hardware.driverController.getLeftY() , hardware.driverController.getRightX());
138+
}
139+
}));
135140

136141
hardware
137142
.driverController

src/main/java/frc/robot/swerve/SwerveSubsystem.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ public class SwerveSubsystem extends StateMachine<SwerveState> {
5252
public static final SwerveDriveKinematics KINEMATICS =
5353
new SwerveDriveKinematics(MODULE_LOCATIONS);
5454

55-
private final CommandXboxController controller;
56-
5755
private final CommandSwerveDrivetrain drivetrain = new CommandSwerveDrivetrain();
5856

5957
public final Pigeon2 drivetrainPigeon = drivetrain.getPigeon2();
@@ -110,9 +108,8 @@ public void setSnapToAngle(double angle) {
110108
goalSnapAngle = angle;
111109
}
112110

113-
public SwerveSubsystem(CommandXboxController driveController) {
111+
public SwerveSubsystem() {
114112
super(SubsystemPriority.SWERVE, SwerveState.TELEOP);
115-
this.controller = driveController;
116113
}
117114

118115
public void setFieldRelativeAutoSpeeds(ChassisSpeeds speeds) {
@@ -124,13 +121,13 @@ public void driveTeleop(double x, double y, double theta) {
124121
double leftY =
125122
-1.0
126123
* ControllerHelpers.getExponent(
127-
ControllerHelpers.getDeadbanded(controller.getLeftY(), leftYDeadband), 1.5);
124+
ControllerHelpers.getDeadbanded(x, leftYDeadband), 1.5);
128125
double leftX =
129126
ControllerHelpers.getExponent(
130-
ControllerHelpers.getDeadbanded(controller.getLeftX(), leftXDeadband), 1.5);
127+
ControllerHelpers.getDeadbanded(y, leftXDeadband), 1.5);
131128
double rightX =
132129
ControllerHelpers.getExponent(
133-
ControllerHelpers.getDeadbanded(controller.getRightX(), rightXDeadband), 2);
130+
ControllerHelpers.getDeadbanded(theta, rightXDeadband), 2);
134131

135132
if (RobotConfig.get().swerve().invertRotation()) {
136133
rightX *= -1.0;

0 commit comments

Comments
 (0)