Team4388/2022NoWayHome
1
0
Fork 0
mirror of https://github.com/Team4388/2022NoWayHome.git synced 2026-06-09 08:48:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Switch to WPI's Xbox controller"

Browse Source 
This reverts commit 0605a1d7a4.
This commit is contained in:
Aarav Shah
2022-01-15 11:31:15 -07:00
parent 6eb5fa261a
commit 045a77d08a
5 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc4388/robot/RobotContainer.java
+29 -30
View File
@@ -5,11 +5,7 @@
package frc4388.robot;
import edu.wpi.first.hal.HAL;
import edu.wpi.first.math.geometry.Rotation2d;
import edu.wpi.first.math.geometry.Translation2d;
import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.XboxController;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.InstantCommand;
import edu.wpi.first.wpilibj2.command.RunCommand;
@@ -18,6 +14,8 @@ import frc4388.robot.Constants.*;
import frc4388.robot.subsystems.LED;
import frc4388.robot.subsystems.SwerveDrive;
import frc4388.utility.LEDPatterns;
import frc4388.utility.controller.IHandController;
import frc4388.utility.controller.XboxController;
/**
* This class is where the bulk of the robot should be declared. Since
@@ -49,8 +47,6 @@ public class RobotContainer {
private final XboxController m_driverXbox = new XboxController(OIConstants.XBOX_DRIVER_ID);
private final XboxController m_operatorXbox = new XboxController(OIConstants.XBOX_OPERATOR_ID);
private final boolean bypassDSController = true;
/**
* The container for the robot. Contains subsystems, OI devices, and commands.
*/
@@ -58,30 +54,19 @@ public class RobotContainer {
configureButtonBindings();
/* Default Commands */
// drives the swerve drive with a two-axis input from the driver controller
float[] joystickAxes = new float[HAL.kMaxJoystickAxes];
HAL.getJoystickAxes((byte) getDriverController().getPort(), joystickAxes);
double leftXAxis = bypassDSController ? joystickAxes[XboxController.Axis.kLeftX.value] : getDriverController().getLeftX();
double leftYAxis = bypassDSController ? joystickAxes[XboxController.Axis.kLeftY.value] : getDriverController().getLeftY();
double rightXAxis = bypassDSController ? joystickAxes[XboxController.Axis.kRightX.value] : getDriverController().getRightX();
m_robotSwerveDrive.setDefaultCommand(new RunCommand(() ->
m_robotSwerveDrive.driveWithInput(clampJoystickAxis(leftXAxis, leftYAxis), -rightXAxis, true),
m_robotSwerveDrive
));
m_robotSwerveDrive.setDefaultCommand(
new RunCommand(() -> m_robotSwerveDrive.driveWithInput(
XboxController.ClampJoystickAxis(
getDriverController().getLeftXAxis(),
getDriverController().getLeftYAxis()),
-getDriverController().getRightXAxis(),
true),
m_robotSwerveDrive));
// continually sends updates to the Blinkin LED controller to keep the lights on
m_robotLED.setDefaultCommand(new RunCommand(m_robotLED::updateLED, m_robotLED));
}
private static double[] clampJoystickAxis(double x, double y) {
double squareMag = x * x + y * y;
double[] ret = { x, y };
if (squareMag > 1.d) {
double mag = Math.sqrt(squareMag);
ret[0] = x / mag;
ret[1] = y / mag;
}
SmartDashboard.putNumberArray("Input", new double[] {squareMag, x, y, ret[0], ret[1]});
return ret;
}
/**
* Use this method to define your button->command mappings. Buttons can be
* created by instantiating a {@link GenericHID} or one of its subclasses
@@ -94,11 +79,11 @@ public class RobotContainer {
.whenPressed(() -> m_robotSwerveDrive.resetGyro());*/
/* Operator Buttons */
// activates "Lit Mode"
new JoystickButton(getOperatorController(), XboxController.Button.kA.value)
new JoystickButton(getOperatorJoystick(), XboxController.A_BUTTON)
.whenPressed(() -> m_robotLED.setPattern(LEDPatterns.LAVA_RAINBOW))
.whenReleased(() -> m_robotLED.setPattern(LEDConstants.DEFAULT_PATTERN));
new JoystickButton(getDriverController(), XboxController.Button.kA.value)
new JoystickButton(getDriverJoystick(), XboxController.A_BUTTON)
.whenPressed(() -> {
m_robotSwerveDrive.m_gyro.setYaw(0);
});
@@ -117,14 +102,28 @@ public class RobotContainer {
/**
* Add your docs here.
*/
public XboxController getDriverController() {
public IHandController getDriverController() {
return m_driverXbox;
}
/**
* Add your docs here.
*/
public XboxController getOperatorController() {
public IHandController getOperatorController() {
return m_operatorXbox;
}
/**
* Add your docs here.
*/
public Joystick getOperatorJoystick() {
return m_operatorXbox.getJoyStick();
}
/**
* Add your docs here.
*/
public Joystick getDriverJoystick() {
return m_driverXbox.getJoyStick();
}
}